ok-script 3.0.0b4__tar.gz → 3.0.1__tar.gz

{ok_script-3.0.0b4 → ok_script-3.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ok-script
-Version: 3.0.0b4
+Version: 3.0.1
 Summary: Vibe Coding Automation Framework
 Author-email: ok-oldking <firedcto@gmail.com>
 License: ok-script License

{ok_script-3.0.0b4 → ok_script-3.0.1}/ok/ui/qt/MainWindow.py

@@ -31,7 +31,7 @@ from ok.util.config import Config
 
 from ok.ui.qt.Communicate import communicate
 from ok.ui.qt.common.config import cfg as ui_config
-from ok.ui.qt.kit import Dialog, KitWindow, NavigationView, Theme as KitTheme, set_toast_anchor, show_toast, \
+from ok.ui.qt.kit import ContentLayer, Dialog, KitWindow, NavigationView, Theme as KitTheme, set_toast_anchor, show_toast, \
     theme as kit_theme
 from ok.ui.qt.kit.theme import set_style_property
 from ok.ui.qt.shell.lazy_page import LazyPage
@@ -103,11 +103,17 @@ class MainWindow(KitWindow):
         self.run_bar = RunBar(exit_event)
         set_style_property(self.title_bar, "fused", True)
 
+        # Pages sit on a content layer; with Mica or Acrylic the material shows only
+        # in the frame around it (title bar, run bar, sidebar).
+        self.content_layer = ContentLayer()
+        layer_layout = QVBoxLayout(self.content_layer)
+        layer_layout.setContentsMargins(0, 0, 0, 0)
+        layer_layout.addWidget(self.stack)
         pages = QHBoxLayout()
         pages.setContentsMargins(0, 0, 0, 0)
         pages.setSpacing(0)
         pages.addWidget(self.navigation)
-        pages.addWidget(self.stack, 1)
+        pages.addWidget(self.content_layer, 1)
         body = QVBoxLayout(self.body)
         body.setContentsMargins(0, 0, 0, 0)
         body.setSpacing(0)
@@ -347,8 +353,9 @@ class MainWindow(KitWindow):
             return self.get_system_accent_color()
 
     def _sync_kit_theme(self):
-        """Apply the saved theme mode and the Windows accent color."""
+        """Apply the saved theme mode, window backdrop and the Windows accent color."""
         kit_theme.set_theme(KitTheme(ui_config.theme_mode))
+        kit_theme.set_backdrop(ui_config.backdrop)
         if accent := self._system_accent():
             kit_theme.set_accent(accent)
 

{ok_script-3.0.0b4 → ok_script-3.0.1}/ok/ui/qt/common/config.py

@@ -1,5 +1,5 @@
 # coding:utf-8
-"""UI preferences stored in ``configs/ui_config.json``: language and theme."""
+"""UI preferences stored in ``configs/ui_config.json``: language, theme and window backdrop."""
 
 import json
 import os
@@ -12,6 +12,8 @@ from ok.util.logger import Logger
 
 logger = Logger.get_logger(__name__)
 
+BACKDROPS = ("mica", "acrylic", "none")
+
 
 class Language(Enum):
     """ Language enumeration """
@@ -39,7 +41,7 @@ def deserialize_language(value) -> Language:
 
 
 class UiConfig(QObject):
-    """The language and the theme mode, both applied live.
+    """The language, the theme mode and the window backdrop, all applied live.
 
     The file also accepts the older qfluentwidgets layout
     (``MainWindow.Language`` and ``QFluentWidgets.ThemeMode``).
@@ -58,6 +60,11 @@ class UiConfig(QObject):
         self.theme_mode = str(data.get("theme", legacy_theme or "auto")).lower()
         if self.theme_mode not in ("light", "dark", "auto"):
             self.theme_mode = "auto"
+        # Older files store only whether Mica is on ("mica", or qfluentwidgets' MicaEnabled).
+        legacy_mica = data.get("mica", (data.get("MainWindow") or {}).get("MicaEnabled", True))
+        self.backdrop = str(data.get("backdrop", "mica" if legacy_mica else "none")).lower()
+        if self.backdrop not in BACKDROPS:
+            self.backdrop = "mica"
 
     def _read(self) -> dict:
         try:
@@ -74,7 +81,8 @@ class UiConfig(QObject):
         try:
             os.makedirs(os.path.dirname(self.path), exist_ok=True)
             with open(self.path, "w", encoding="utf-8") as file:
-                json.dump({"language": serialize_language(self.language), "theme": self.theme_mode}, file, indent=4)
+                json.dump({"language": serialize_language(self.language), "theme": self.theme_mode,
+                           "backdrop": self.backdrop}, file, indent=4)
         except OSError as error:
             logger.error(f"Failed to save {self.path}", error)
 
@@ -93,5 +101,13 @@ class UiConfig(QObject):
         self.save()
         self.theme_changed.emit()
 
+    def set_backdrop(self, backdrop: str) -> None:
+        backdrop = getattr(backdrop, "value", backdrop)
+        if backdrop == self.backdrop or backdrop not in BACKDROPS:
+            return
+        self.backdrop = backdrop
+        self.save()
+        self.theme_changed.emit()
+
 
 cfg = UiConfig(get_relative_path('configs', "ui_config.json"))

{ok_script-3.0.0b4 → ok_script-3.0.1}/ok/ui/qt/i18n/en_US.ts

@@ -765,6 +765,26 @@
             <source>Configuration takes effect after restart</source>
             <translation>Configuration takes effect after restart</translation>
         </message>
+        <message>
+            <source>Window Material</source>
+            <translation>Window Material</translation>
+        </message>
+        <message>
+            <source>Mica tints the window with your wallpaper, Acrylic blurs what is behind it</source>
+            <translation>Mica tints the window with your wallpaper, Acrylic blurs what is behind it</translation>
+        </message>
+        <message>
+            <source>Mica</source>
+            <translation>Mica</translation>
+        </message>
+        <message>
+            <source>Acrylic</source>
+            <translation>Acrylic</translation>
+        </message>
+        <message>
+            <source>None</source>
+            <translation>None</translation>
+        </message>
     </context>
     <context>
         <name>StartButton</name>

{ok_script-3.0.0b4 → ok_script-3.0.1}/ok/ui/qt/i18n/es_ES.ts

@@ -763,6 +763,26 @@
             <source>Configuration takes effect after restart</source>
             <translation>La configuración se aplicará después de reiniciar</translation>
         </message>
+        <message>
+            <source>Window Material</source>
+            <translation>Material de la ventana</translation>
+        </message>
+        <message>
+            <source>Mica tints the window with your wallpaper, Acrylic blurs what is behind it</source>
+            <translation>Mica tiñe la ventana con tu fondo de pantalla; Acrílico desenfoca lo que hay detrás</translation>
+        </message>
+        <message>
+            <source>Mica</source>
+            <translation>Mica</translation>
+        </message>
+        <message>
+            <source>Acrylic</source>
+            <translation>Acrílico</translation>
+        </message>
+        <message>
+            <source>None</source>
+            <translation>Ninguno</translation>
+        </message>
     </context>
     <context>
         <name>StartButton</name>

{ok_script-3.0.0b4 → ok_script-3.0.1}/ok/ui/qt/i18n/ja_JP.ts

@@ -763,6 +763,26 @@
             <source>Configuration takes effect after restart</source>
             <translation>設定は再起動後に有効になります</translation>
         </message>
+        <message>
+            <source>Window Material</source>
+            <translation>ウィンドウの素材</translation>
+        </message>
+        <message>
+            <source>Mica tints the window with your wallpaper, Acrylic blurs what is behind it</source>
+            <translation>マイカは壁紙の色でウィンドウを色付けし、アクリルは背後を透かしてぼかします</translation>
+        </message>
+        <message>
+            <source>Mica</source>
+            <translation>マイカ</translation>
+        </message>
+        <message>
+            <source>Acrylic</source>
+            <translation>アクリル</translation>
+        </message>
+        <message>
+            <source>None</source>
+            <translation>なし</translation>
+        </message>
     </context>
     <context>
         <name>StartButton</name>

{ok_script-3.0.0b4 → ok_script-3.0.1}/ok/ui/qt/i18n/ko_KR.ts

@@ -764,6 +764,26 @@
             <source>Configuration takes effect after restart</source>
             <translation>다시 시작하면 구성이 적용됩니다</translation>
         </message>
+        <message>
+            <source>Window Material</source>
+            <translation>창 재질</translation>
+        </message>
+        <message>
+            <source>Mica tints the window with your wallpaper, Acrylic blurs what is behind it</source>
+            <translation>Mica는 바탕 화면 배경으로 창에 색을 입히고, 아크릴은 창 뒤를 흐리게 보여 줍니다</translation>
+        </message>
+        <message>
+            <source>Mica</source>
+            <translation>Mica</translation>
+        </message>
+        <message>
+            <source>Acrylic</source>
+            <translation>아크릴</translation>
+        </message>
+        <message>
+            <source>None</source>
+            <translation>없음</translation>
+        </message>
     </context>
     <context>
         <name>StartButton</name>

{ok_script-3.0.0b4 → ok_script-3.0.1}/ok/ui/qt/i18n/zh_CN.ts

@@ -765,6 +765,26 @@
             <source>Configuration takes effect after restart</source>
             <translation>配置在重启后生效</translation>
         </message>
+        <message>
+            <source>Window Material</source>
+            <translation>窗口材质</translation>
+        </message>
+        <message>
+            <source>Mica tints the window with your wallpaper, Acrylic blurs what is behind it</source>
+            <translation>云母以桌面壁纸为窗口着色，亚克力会模糊窗口后方的内容</translation>
+        </message>
+        <message>
+            <source>Mica</source>
+            <translation>云母</translation>
+        </message>
+        <message>
+            <source>Acrylic</source>
+            <translation>亚克力</translation>
+        </message>
+        <message>
+            <source>None</source>
+            <translation>无</translation>
+        </message>
     </context>
     <context>
         <name>StartButton</name>

{ok_script-3.0.0b4 → ok_script-3.0.1}/ok/ui/qt/i18n/zh_TW.ts

@@ -763,6 +763,26 @@
             <source>Configuration takes effect after restart</source>
             <translation>設定將在重啟後生效</translation>
         </message>
+        <message>
+            <source>Window Material</source>
+            <translation>視窗材質</translation>
+        </message>
+        <message>
+            <source>Mica tints the window with your wallpaper, Acrylic blurs what is behind it</source>
+            <translation>雲母以桌布為視窗著色，壓克力會模糊視窗後方的內容</translation>
+        </message>
+        <message>
+            <source>Mica</source>
+            <translation>雲母</translation>
+        </message>
+        <message>
+            <source>Acrylic</source>
+            <translation>壓克力</translation>
+        </message>
+        <message>
+            <source>None</source>
+            <translation>無</translation>
+        </message>
     </context>
     <context>
         <name>StartButton</name>

{ok_script-3.0.0b4 → ok_script-3.0.1}/ok/ui/qt/kit/__init__.py

@@ -19,10 +19,11 @@ from ok.ui.qt.kit.popover import Popover
 from ok.ui.qt.kit.switch import Switch
 from ok.ui.qt.kit.tabs import TabItem, TabStrip
 from ok.ui.qt.kit.theme import Theme, theme
-from ok.ui.qt.kit.window import KitWindow, TitleBar
+from ok.ui.qt.kit.window import ContentLayer, KitWindow, TitleBar
 
 __all__ = [
-    "Button", "Card", "ComboBox", "Dialog", "FlowLayout", "ICON_NAMES", "KitWindow", "Label", "NavItem",
+    "Button", "Card", "ComboBox", "ContentLayer", "Dialog", "FlowLayout", "ICON_NAMES", "KitWindow", "Label",
+    "NavItem",
     "NavigationView", "NumberBox", "OptionCard", "OptionGroup", "Pill", "Popover", "ProgressRing", "SettingGroup",
     "SettingRow", "StatusDot", "Switch", "TabItem", "TabStrip", "Theme", "TitleBar", "Toast", "confirm", "icon",
     "load_icon", "set_toast_anchor", "set_toast_top_margin", "show_toast", "theme",

{ok_script-3.0.0b4 → ok_script-3.0.1}/ok/ui/qt/kit/feedback.py

@@ -27,10 +27,34 @@ class Pill(QLabel):
         super().__init__(text, parent)
         self.setProperty("tone", _check_tone(tone))
         self.setSizePolicy(QSizePolicy.Policy.Maximum, QSizePolicy.Policy.Fixed)
+        theme.changed.connect(self.update)
 
     def set_tone(self, tone: str) -> None:
         set_style_property(self, "tone", _check_tone(tone))
 
+    def paintEvent(self, event) -> None:
+        tone = self.property("tone")
+        if tone == "neutral":
+            fill, outline = theme.color("control"), theme.color("border_strong")
+        else:
+            color = theme.color(_TONE_COLOR[tone])
+            fill, outline = QColor(color), QColor(color)
+            fill_alpha, line_alpha = {
+                "accent": (0.14, 0.6), "success": (0.1, 0.3),
+                "warning": (0.12, 0.35), "danger": (0.12, 0.45),
+            }[tone]
+            fill.setAlphaF(fill_alpha)
+            outline.setAlphaF(line_alpha)
+        # QSS draws translucent borders in segments, leaving seams at the
+        # rounded corners. A single antialiased stroke avoids those overlaps.
+        painter = QPainter(self)
+        painter.setRenderHint(QPainter.RenderHint.Antialiasing)
+        painter.setBrush(fill)
+        painter.setPen(QPen(outline, 1))
+        painter.drawRoundedRect(QRectF(self.rect()).adjusted(0.5, 0.5, -0.5, -0.5), 5.5, 5.5)
+        painter.end()
+        super().paintEvent(event)
+
 
 class StatusDot(QWidget):
     """A colored dot with a soft halo showing a connection or run state."""

{ok_script-3.0.0b4 → ok_script-3.0.1}/ok/ui/qt/kit/qss.py

@@ -3,7 +3,7 @@
 from PySide6.QtGui import QColor
 
 from ok.ui.qt.kit.icons import icon_file
-from ok.ui.qt.kit.theme import FONT_FAMILY, MONO_FONT_FAMILY, rgba
+from ok.ui.qt.kit.theme import FONT_FAMILY, MONO_FONT_FAMILY, Backdrop, rgba
 
 _TEMPLATE = """
 QWidget {{
@@ -12,11 +12,11 @@ QWidget {{
     font-size: 13px;
 }}
 QWidget#kitRoot, KitWindow {{
-    background: {window};
+    background: {window_bg};
 }}
 QWidget#kitSidebar {{
-    background: {sidebar};
-    border-right: 1px solid {separator};
+    background: {sidebar_bg};
+    border-right: 1px solid {frame_separator};
 }}
 
 QLabel {{ background: transparent; }}
@@ -109,12 +109,12 @@ TabItem QLabel#tabCount[selected="true"] {{ color: #FFFFFF; background: {accent_
 
 Pill {{
     font-size: 11.5px; font-weight: 500; border-radius: 6px; padding: 1px 8px;
-    color: {text_secondary}; background: {control}; border: 1px solid {border_strong};
+    color: {text_secondary}; background: transparent; border: 1px solid transparent;
 }}
-Pill[tone="accent"] {{ color: {text}; background: {accent_soft}; border-color: {accent_line}; }}
-Pill[tone="success"] {{ color: {success}; background: {success_soft}; border-color: {success_line}; }}
-Pill[tone="warning"] {{ color: {warning}; background: {warning_soft}; border-color: {warning_line}; }}
-Pill[tone="danger"] {{ color: {danger}; background: {danger_soft}; border-color: {danger_line}; }}
+Pill[tone="accent"] {{ color: {text}; }}
+Pill[tone="success"] {{ color: {success}; }}
+Pill[tone="warning"] {{ color: {warning}; }}
+Pill[tone="danger"] {{ color: {danger}; }}
 
 QLineEdit, QAbstractSpinBox, QTextEdit, QPlainTextEdit {{
     background: {control};
@@ -254,7 +254,7 @@ Toast {{
 }}
 
 QWidget#kitTitleBar {{
-    background: {sidebar};
+    background: {sidebar_bg};
     border-bottom: 1px solid {separator};
 }}
 QLabel#titleBadge {{
@@ -285,9 +285,9 @@ OptionCard:hover {{ border-color: {border_strong}; }}
 OptionCard[selected="true"] {{ background: {accent_soft_weak}; border-color: {accent_line}; }}
 QWidget#kitTitleBar[fused="true"] {{ border-bottom: 0; }}
 RunBar {{
-    background: {sidebar};
+    background: {sidebar_bg};
     border: 0;
-    border-bottom: 1px solid {separator};
+    border-bottom: 1px solid {frame_separator};
 }}
 ConnectionPill {{
     background: transparent;
@@ -423,7 +423,12 @@ def build_stylesheet(manager) -> str:
     accent = manager.accent()
     dark = manager.is_dark()
     success, warning, danger = (QColor(tokens[name]) for name in ("success", "warning", "danger"))
+    window_bg, sidebar_bg = (manager.background(name) for name in ("window", "sidebar"))
     return _TEMPLATE.format(
+        window_bg=rgba(window_bg, window_bg.alphaF()),
+        sidebar_bg=rgba(sidebar_bg, sidebar_bg.alphaF()),
+        # With a backdrop the content layer's own edge separates it from the frame.
+        frame_separator=tokens["separator"] if manager.backdrop() == Backdrop.NONE else "transparent",
         font=FONT_FAMILY,
         mono=MONO_FONT_FAMILY,
         accent=accent.name(),

{ok_script-3.0.0b4 → ok_script-3.0.1}/ok/ui/qt/kit/theme.py

@@ -8,6 +8,7 @@ theme changes. Installing on a root widget instead of the application keeps
 the kit from restyling widgets that are not part of it.
 """
 
+import sys
 import weakref
 from enum import Enum
 
@@ -74,6 +75,47 @@ LIGHT_TOKENS = {
 }
 
 
+class Backdrop(Enum):
+    """The DWM material drawn behind kit windows."""
+
+    NONE = "none"
+    MICA = "mica"
+    ACRYLIC = "acrylic"
+
+
+# With a backdrop only the window frame (title bar, run bar, sidebar) shows the
+# material, under one tint of the sidebar color at this opacity. Page content
+# sits on an opaque layer (see ContentLayer), so cards, inputs and text keep
+# their normal colors. Acrylic shows whatever is behind the window, so it gets
+# a stronger tint than Mica to keep the frame readable.
+BACKDROP_TINT = {
+    (Backdrop.MICA, False): 0.35, (Backdrop.MICA, True): 0.45,
+    (Backdrop.ACRYLIC, False): 0.8, (Backdrop.ACRYLIC, True): 0.65,
+}
+
+MICA_MIN_BUILD = 22000  # Windows 11 21H2, through an undocumented attribute
+SYSTEMBACKDROP_MIN_BUILD = 22523  # DWMWA_SYSTEMBACKDROP_TYPE (Mica and Acrylic)
+
+
+def _windows_build() -> int:
+    return sys.getwindowsversion().build if sys.platform == "win32" else 0
+
+
+def backdrop_supported(backdrop) -> bool:
+    """Whether DWM on this system can draw ``backdrop``."""
+
+    backdrop = Backdrop(backdrop)
+    if backdrop == Backdrop.NONE:
+        return True
+    if backdrop == Backdrop.MICA:
+        return _windows_build() >= MICA_MIN_BUILD
+    return _windows_build() >= SYSTEMBACKDROP_MIN_BUILD
+
+
+def supported_backdrops() -> list:
+    return [backdrop for backdrop in Backdrop if backdrop_supported(backdrop)]
+
+
 def _channel(value: float) -> float:
     value /= 255
     return value / 12.92 if value <= 0.03928 else ((value + 0.055) / 1.055) ** 2.4
@@ -118,11 +160,45 @@ class ThemeManager(QObject):
         self._accent = QColor(DEFAULT_ACCENT)
         self._roots = []
         self._watching_system = False
+        self._backdrop = Backdrop.NONE
 
     @property
     def mode(self) -> Theme:
         return self._mode
 
+    def backdrop(self) -> Backdrop:
+        """The material kit windows draw on; NONE when unsupported."""
+
+        return self._backdrop
+
+    def set_backdrop(self, backdrop) -> None:
+        backdrop = Backdrop(backdrop)
+        if not backdrop_supported(backdrop):
+            backdrop = Backdrop.NONE
+        if backdrop == self._backdrop:
+            return
+        self._backdrop = backdrop
+        self._refresh()
+
+    def background(self, name: str) -> QColor:
+        """The fill for a window-level background, adjusted for the backdrop.
+
+        ``window``: the whole window (under the frame); ``sidebar``: the frame
+        parts (sidebar, title bar, run bar); ``layer``: the panel page content
+        sits on. Without a backdrop these are the plain tokens, and the layer is
+        transparent so the window color shows.
+        """
+
+        if self._backdrop == Backdrop.NONE:
+            return QColor(0, 0, 0, 0) if name == "layer" else self.color(name)
+        if name == "layer":
+            return self.color("window")
+        if name == "sidebar":
+            return QColor(0, 0, 0, 0)
+        color = self.color("sidebar")
+        color.setAlphaF(BACKDROP_TINT[(self._backdrop, self.is_dark())])
+        return color
+
     def set_theme(self, mode: Theme) -> None:
         mode = Theme(mode)
         if mode == self._mode: