ok-script 3.0.0b2__tar.gz → 3.0.0b3__tar.gz

{ok_script-3.0.0b2 → ok_script-3.0.0b3}/PKG-INFO

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

{ok_script-3.0.0b2 → ok_script-3.0.0b3}/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_bottom_margin, show_toast, \
+from ok.ui.qt.kit import 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
@@ -47,8 +47,6 @@ from ok.util.logger import Logger
 
 logger = Logger.get_logger(__name__)
 
-PAGE_MARGIN = 12
-
 SECTION_RUN = "run"
 SECTION_GAME = "game"
 SECTION_DEVELOP = "develop"
@@ -115,7 +113,8 @@ class MainWindow(KitWindow):
         body.setSpacing(0)
         body.addWidget(self.run_bar)
         body.addLayout(pages, 1)
-        set_toast_bottom_margin(self, PAGE_MARGIN)
+        # Keep tips flush with the bottom edge of the title bar.
+        set_toast_anchor(self, self.title_bar, gap=0)
 
         self.schedule_tab = None
         self.global_config_tabs = []  # [(config, LazyPage)]

{ok_script-3.0.0b2 → ok_script-3.0.0b3}/ok/ui/qt/kit/__init__.py

@@ -8,7 +8,7 @@ its children; plain Qt inputs inside it are styled too.
 from ok.ui.qt.kit.buttons import Button
 from ok.ui.qt.kit.cards import Card, SettingGroup, SettingRow
 from ok.ui.qt.kit.dialogs import Dialog, confirm
-from ok.ui.qt.kit.feedback import Pill, ProgressRing, StatusDot, Toast, set_toast_bottom_margin, show_toast
+from ok.ui.qt.kit.feedback import Pill, ProgressRing, StatusDot, Toast, set_toast_anchor, set_toast_top_margin, show_toast
 from ok.ui.qt.kit.icons import ICON_NAMES, icon, load_icon
 from ok.ui.qt.kit.inputs import ComboBox, NumberBox
 from ok.ui.qt.kit.labels import Label
@@ -25,5 +25,5 @@ __all__ = [
     "Button", "Card", "ComboBox", "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_bottom_margin", "show_toast", "theme",
+    "load_icon", "set_toast_anchor", "set_toast_top_margin", "show_toast", "theme",
 ]

{ok_script-3.0.0b2 → ok_script-3.0.0b3}/ok/ui/qt/kit/feedback.py

@@ -125,13 +125,15 @@ class ProgressRing(QWidget):
 
 
 class Toast(QWidget):
-    """A message card shown at the bottom right of a window; see :func:`show_toast`."""
+    """A message card shown at the top center of a window; see :func:`show_toast`."""
+
+    WIDTH = 560
 
     def __init__(self, message: str, title: str = None, tone: str = "neutral", action: tuple = None, parent=None):
         super().__init__(parent)
         self.setAttribute(Qt.WidgetAttribute.WA_StyledBackground, True)
         self.tone = _check_tone(tone)
-        self.setFixedWidth(360)
+        self.setFixedWidth(self.WIDTH)
 
         icon_label = QLabel(self)
         icon_label.setPixmap(kit_icon(_TONE_ICON[tone], _TONE_COLOR[tone], 2).pixmap(QSize(18, 18), self.devicePixelRatioF()))
@@ -165,15 +167,19 @@ class Toast(QWidget):
 
 
 class _ToastHost(QObject):
-    """Stacks toasts in a window's bottom-right corner above ``bottom_margin``."""
+    """Stacks toasts down from a window's top center, below ``anchor`` if set."""
 
     SPACING = 8
+    MARGIN = 16
+    ANCHOR_GAP = 4
 
     def __init__(self, window: QWidget):
         super().__init__(window)
         self.window = window
         self.toasts = []
-        self.bottom_margin = 16
+        self.anchor = None
+        self.anchor_gap = self.ANCHOR_GAP
+        self.top_margin = self.MARGIN
         window.installEventFilter(self)
 
     def add(self, toast: Toast, duration: int) -> None:
@@ -182,8 +188,7 @@ class _ToastHost(QObject):
         toast.destroyed.connect(lambda *_: self._forget(toast))
         toast.setAttribute(Qt.WidgetAttribute.WA_DeleteOnClose, True)
         self.toasts.append(toast)
-        # Wrapped labels need height-for-width; adjustSize() would leave gaps.
-        toast.resize(toast.width(), toast.layout().totalHeightForWidth(toast.width()))
+        self._fit(toast)
         toast.show()
         toast.raise_()
         self.layout()
@@ -198,16 +203,30 @@ class _ToastHost(QObject):
             self.toasts.remove(toast)
             self.layout()
 
+    def _fit(self, toast) -> None:
+        # Narrow windows shrink the toast; wrapped labels need height-for-width,
+        # since adjustSize() would leave gaps.
+        width = max(240, min(Toast.WIDTH, self.window.width() - 2 * self.MARGIN))
+        toast.setFixedWidth(width)
+        toast.resize(width, toast.layout().totalHeightForWidth(width))
+
+    def _top(self) -> int:
+        anchor = self.anchor
+        if anchor is not None and shiboken6.isValid(anchor) and anchor.isVisible():
+            return anchor.mapTo(self.window, anchor.rect().bottomLeft()).y() + 1 + self.anchor_gap
+        return self.top_margin
+
     def layout(self) -> None:
         self.toasts = [toast for toast in self.toasts if toast.isVisible()]
-        y = self.window.height() - self.bottom_margin
-        for toast in reversed(self.toasts):
-            y -= toast.height()
-            toast.move(self.window.width() - toast.width() - 16, y)
-            y -= self.SPACING
+        y = self._top()
+        for toast in self.toasts:
+            toast.move((self.window.width() - toast.width()) // 2, y)
+            y += toast.height() + self.SPACING
 
     def eventFilter(self, watched, event) -> bool:
         if watched is self.window and event.type() == QEvent.Type.Resize:
+            for toast in self.toasts:
+                self._fit(toast)
             self.layout()
         return False
 
@@ -231,9 +250,19 @@ def show_toast(parent: QWidget, message: str, title: str = None, tone: str = "ne
     return toast
 
 
-def set_toast_bottom_margin(widget: QWidget, margin: int) -> None:
-    """Keep toasts in ``widget``'s window above e.g. a status bar."""
+def set_toast_anchor(widget: QWidget, anchor: QWidget, *, gap: int = 4) -> None:
+    """Show toasts below ``anchor`` with the requested gap in logical pixels."""
+
+    host = toast_host(widget)
+    host.anchor = anchor
+    host.anchor_gap = max(0, int(gap))
+    host.layout()
+
+
+def set_toast_top_margin(widget: QWidget, margin: int) -> None:
+    """Position toasts directly below the window's top edge."""
 
     host = toast_host(widget)
-    host.bottom_margin = margin
+    host.anchor = None
+    host.top_margin = max(0, int(margin))
     host.layout()

{ok_script-3.0.0b2 → ok_script-3.0.0b3}/ok/ui/qt/kit/icons.py

@@ -220,6 +220,100 @@ class _SvgFileIconEngine(QIconEngine):
         return _SvgFileIconEngine(self.data)
 
 
+class _RasterFileIconEngine(QIconEngine):
+    """Fit raster artwork by its visible bounds, preserving its aspect ratio."""
+
+    def __init__(self, image: QImage):
+        super().__init__()
+        self.image = image
+
+    def paint(self, painter, rect, mode, state):
+        scale = min(rect.width() / self.image.width(), rect.height() / self.image.height())
+        width, height = self.image.width() * scale, self.image.height() * scale
+        target = QRectF(rect.x() + (rect.width() - width) / 2,
+                        rect.y() + (rect.height() - height) / 2, width, height)
+        painter.save()
+        painter.setRenderHint(QPainter.RenderHint.SmoothPixmapTransform)
+        if mode == QIcon.Mode.Disabled:
+            painter.setOpacity(painter.opacity() * 0.4)
+        painter.drawImage(target, self.image)
+        painter.restore()
+
+    def pixmap(self, size, mode, state):
+        return self.scaledPixmap(size, mode, state, 1.0)
+
+    def scaledPixmap(self, size, mode, state, scale):
+        image = QImage(round(size.width() * scale), round(size.height() * scale),
+                       QImage.Format.Format_ARGB32_Premultiplied)
+        image.fill(Qt.GlobalColor.transparent)
+        painter = QPainter(image)
+        self.paint(painter, image.rect(), mode, state)
+        painter.end()
+        result = QPixmap.fromImage(image)
+        result.setDevicePixelRatio(scale)
+        return result
+
+    def clone(self):
+        return _RasterFileIconEngine(self.image)
+
+
+class _ColorizedIconEngine(QIconEngine):
+    """Tint an icon's alpha mask using a color resolved for the current theme."""
+
+    def __init__(self, source: QIcon, color):
+        super().__init__()
+        self.source = source
+        self.color = color
+
+    def paint(self, painter, rect, mode, state):
+        size = QSize(max(1, round(rect.width())), max(1, round(rect.height())))
+        pixmap = self.scaledPixmap(size, mode, state, painter.device().devicePixelRatioF())
+        painter.drawPixmap(rect, pixmap)
+
+    def pixmap(self, size, mode, state):
+        return self.scaledPixmap(size, mode, state, 1.0)
+
+    def scaledPixmap(self, size, mode, state, scale):
+        from ok.ui.qt.kit.theme import theme
+
+        value = self.color
+        if isinstance(value, dict):
+            value = value.get("dark" if theme.is_dark() else "light", "text")
+        color = theme.color(value) if isinstance(value, str) and not value.startswith("#") else QColor(value)
+        if mode == QIcon.Mode.Disabled:
+            color.setAlphaF(color.alphaF() * 0.4)
+        image = self.source.pixmap(size, scale, QIcon.Mode.Normal, state).toImage()
+        painter = QPainter(image)
+        painter.setCompositionMode(QPainter.CompositionMode.CompositionMode_SourceIn)
+        painter.fillRect(image.rect(), color)
+        painter.end()
+        result = QPixmap.fromImage(image)
+        result.setDevicePixelRatio(image.devicePixelRatio())
+        return result
+
+    def clone(self):
+        return _ColorizedIconEngine(self.source, self.color)
+
+
+def tinted_icon(source: QIcon, color) -> QIcon:
+    """Recolor artwork at paint time; ``color`` can supply light/dark shades."""
+
+    return QIcon(_ColorizedIconEngine(source, color))
+
+
+def _trim_transparent(image: QImage) -> QImage:
+    rgba = image.convertToFormat(QImage.Format.Format_RGBA8888)
+    # Ignore nearly invisible export fringes when measuring the artwork.
+    occupied = [i for i, alpha in enumerate(bytes(rgba.constBits())[3::4]) if alpha >= 16]
+    if not occupied:
+        return image
+    width = rgba.width()
+    left = min(i % width for i in occupied)
+    right = max(i % width for i in occupied)
+    top, bottom = occupied[0] // width, occupied[-1] // width
+    return image.copy(left, top, right - left + 1, bottom - top + 1)
+
+
 def icon(name: str, color=None, stroke_width: float = 1.75) -> QIcon:
     """A bundled icon.
 
@@ -231,25 +325,32 @@ def icon(name: str, color=None, stroke_width: float = 1.75) -> QIcon:
 
 
 @lru_cache(maxsize=256)
-def _load_file_icon(path: str, mtime: float) -> QIcon:
+def _load_file_icon(path: str, mtime: float, trim_transparent: bool = False) -> QIcon:
     if path.lower().endswith(".svg"):
         data = Path(path).read_bytes()
         engine = _SvgFileIconEngine(data)
         if not engine.renderer.isValid():
             raise ValueError(f"invalid SVG icon: {path}")
         return QIcon(engine)
+    if trim_transparent:
+        image = QImage(path)
+        if image.isNull():
+            raise ValueError(f"unsupported icon file: {path}")
+        return QIcon(_RasterFileIconEngine(_trim_transparent(image)))
     result = QIcon(path)
     if result.isNull():
         raise ValueError(f"unsupported icon file: {path}")
     return result
 
 
-def load_icon(source, base_dir=None) -> QIcon:
+def load_icon(source, base_dir=None, *, trim_transparent: bool = False) -> QIcon:
     """Load an app-provided icon.
 
     ``source`` is a path to an ``.svg`` or raster file (relative paths are
     resolved against ``base_dir`` or the working directory), a ``QIcon``, or
     ``None`` for no icon.
+    ``trim_transparent`` fits raster artwork by its alpha bounds at paint time;
+    the source file stays unchanged.
     """
 
     if source is None:
@@ -262,4 +363,4 @@ def load_icon(source, base_dir=None) -> QIcon:
     path = path.resolve()
     if not path.is_file():
         raise FileNotFoundError(f"icon file not found: {path}")
-    return _load_file_icon(str(path), path.stat().st_mtime)
+    return _load_file_icon(str(path), path.stat().st_mtime, trim_transparent)

{ok_script-3.0.0b2 → ok_script-3.0.0b3}/ok/ui/qt/kit/tabs.py

@@ -54,8 +54,9 @@ class TabItem(QPushButton):
             self.icon_label.hide()
             return
         icon = source if isinstance(source, QIcon) else kit_icon(source, "text" if self.isChecked() else "text_secondary")
-        self.icon_label.setPixmap(icon.pixmap(QSize(16, 16), self.devicePixelRatioF()))
-        self.icon_label.setFixedSize(16, 16)
+        size = 20 if isinstance(source, QIcon) else 16
+        self.icon_label.setPixmap(icon.pixmap(QSize(size, size), self.devicePixelRatioF()))
+        self.icon_label.setFixedSize(size, size)
         self.icon_label.show()
 
     def _on_toggled(self, checked: bool) -> None:

{ok_script-3.0.0b2 → ok_script-3.0.0b3}/ok/ui/qt/plugins/imported_tabs.py

@@ -18,6 +18,7 @@ class ImportedTaskTab(TasksPage):
     def __init__(self, namespace, name):
         self.namespace = namespace
         self.imported_file_name = namespace
+        self.state_name = f"tasks_page_{namespace}"
         super().__init__(title=og.app.tr(name))
 
     def collect_tasks(self):

{ok_script-3.0.0b2 → ok_script-3.0.0b3}/ok/ui/qt/shell/nav_icons.py

@@ -19,7 +19,7 @@ _SEMANTIC = {
 FALLBACK = "grid"
 
 
-def nav_icon(source, base_dir=None):
+def nav_icon(source, base_dir=None, *, trim_transparent: bool = False):
     """A bundled icon name or a QIcon for ``source``.
 
     Accepts ``None``, a bundled icon name, an ``ok.core.icons.Icon``, a path to
@@ -43,7 +43,7 @@ def nav_icon(source, base_dir=None):
             return _SEMANTIC[semantic]
         if Path(source).suffix.lower() in (".svg", ".png", ".jpg", ".jpeg", ".ico", ".bmp", ".webp"):
             try:
-                return load_icon(source, base_dir)
+                return load_icon(source, base_dir, trim_transparent=trim_transparent)
             except (OSError, ValueError):
                 return FALLBACK
         return FALLBACK

{ok_script-3.0.0b2 → ok_script-3.0.0b3}/ok/ui/qt/shell/run_bar.py

@@ -95,11 +95,10 @@ def compute_run_state(executor, device_manager, starting: bool = False, game_nam
             return RunState("pause", pause_app, _t("StartCard", "Paused: PC Game Window Must Be in Front!"), "danger")
         queued = len([t for t in executor.onetime_task_queue if t is not task and t.enabled])
         return RunState("pause", pause_app, task=task, queued=queued)
-    if count := executor.active_trigger_task_count():
+    if executor.active_trigger_task_count():
         if not executor.can_capture():
             return RunState("pause", pause_app, _t("StartCard", "Paused: PC Game Window Must Be in Front!"), "danger")
-        return RunState("pause", pause_app,
-                        f'{_t("StartCard", "Running")}: {count} {_t("StartCard", "Trigger Tasks")}')
+        return RunState("pause", pause_app)
     return RunState("pause", pause_app, _t("StartCard", "Waiting for task to be enabled"))
 
 
@@ -268,7 +267,10 @@ class RunBar(QFrame):
         button = self.executor_button
         button.setEnabled(state.button != "disabled")
         button.setText(state.button_text)
-        if state.button == "start" or state.button == "disabled":
+        if state.button == "start":
+            button.set_icon("power")
+            button.set_variant("primary")
+        elif state.button == "disabled":
             button.set_icon("power")
             button.set_variant("tonal")
         elif state.button == "pause":