ok-script 2.0.23b1__tar.gz → 3.0.0__tar.gz

{ok_script-2.0.23b1 → ok_script-3.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ok-script
-Version: 2.0.23b1
+Version: 3.0.0
 Summary: Vibe Coding Automation Framework
 Author-email: ok-oldking <firedcto@gmail.com>
 License: ok-script License
@@ -230,6 +230,16 @@ python -m venv .venv
 - [白荆回廊](https://github.com/ok-oldking/ok-baijing)（停止维护）
 - [崩坏：星穹铁道](https://github.com/Shasnow/ok-starrailassistant)（停止维护）
 
+## 开发 ok-script
+
+在本仓库中测试界面改动时，可以用 [main.py](main.py) 中的演示配置直接从源码启动 GUI：
+
+```powershell
+.\.venv\Scripts\python.exe main.py
+```
+
+它以记事本为目标窗口，无需游戏，并注册了一个演示一次性任务和一个触发任务，让任务、计划任务和模板页面都有内容。设置和日志保存在已被 git 忽略的 `configs/` 和 `logs/` 目录中。需要测试其他选项时，修改 `main.py` 中的 `config` 字典或演示任务即可。
+
 ## 社区与发布
 
 - 开发者 QQ 群：938132715

{ok_script-2.0.23b1 → ok_script-3.0.0}/README.md

@@ -106,6 +106,16 @@ python -m venv .venv
 - [白荆回廊](https://github.com/ok-oldking/ok-baijing)（停止维护）
 - [崩坏：星穹铁道](https://github.com/Shasnow/ok-starrailassistant)（停止维护）
 
+## 开发 ok-script
+
+在本仓库中测试界面改动时，可以用 [main.py](main.py) 中的演示配置直接从源码启动 GUI：
+
+```powershell
+.\.venv\Scripts\python.exe main.py
+```
+
+它以记事本为目标窗口，无需游戏，并注册了一个演示一次性任务和一个触发任务，让任务、计划任务和模板页面都有内容。设置和日志保存在已被 git 忽略的 `configs/` 和 `logs/` 目录中。需要测试其他选项时，修改 `main.py` 中的 `config` 字典或演示任务即可。
+
 ## 社区与发布
 
 - 开发者 QQ 群：938132715

{ok_script-2.0.23b1 → ok_script-3.0.0}/ok/__init__.py

@@ -310,6 +310,8 @@ class App(_OverlayConfigMixin):
         self.global_config = task_executor.global_config if task_executor else None
         from ok.ui.qt.util.app import init_app_config
         self.app, self.locale = init_app_config()
+        from ok.ui.qt.common.config import cfg as ui_config
+        ui_config.language_changed.connect(self._on_language_changed)
         install_qt_event_dispatcher()
         self.app.aboutToQuit.connect(self._close_device_manager)
         if task_executor is not None:
@@ -461,6 +463,44 @@ class App(_OverlayConfigMixin):
         self.do_show_main()
 
     def do_show_main(self):
+        self._create_main_window()
+        self.main_window.show()
+        self.main_window.bring_to_front()
+
+        logger.debug(f'show_main_window end')
+
+    def _on_language_changed(self):
+        # The signal comes from a widget in the window being replaced; rebuild once it returns.
+        from PySide6.QtCore import QTimer
+        QTimer.singleShot(0, self._apply_language)
+
+    def _apply_language(self):
+        from ok.ui.qt.util.app import install_translator
+        self.locale = install_translator(self.app)
+        self.po_translation = None
+        if og.executor is not None:
+            og.executor.locale = self.locale
+            og.executor.load_tr()
+        logger.info(f'language changed to {self.locale.name()}')
+
+        old_window = self.main_window
+        if old_window is None:
+            return
+        # Every page translates its text on construction, so build a fresh window.
+        visible = old_window.isVisible()
+        old_window.update_ok_config()
+        old_window.dispose()
+        self._create_main_window()
+        # Startup work in the first showEvent has already run for this process.
+        self.main_window.shown = True
+        self.main_window.switch_to(self.main_window.setting_tab)
+        if visible:
+            self.main_window.show()
+            self.main_window.bring_to_front()
+        old_window.hide()
+        old_window.deleteLater()
+
+    def _create_main_window(self):
         from ok.ui.qt.MainWindow import MainWindow
 
         self.main_window = MainWindow(self, self.config, self.ok_config, self.icon, self.title, self.version,
@@ -482,11 +522,6 @@ class App(_OverlayConfigMixin):
             if hasattr(og.my_app, 'on_show_main_window'):
                 og.my_app.on_show_main_window(self.main_window)
 
-        self.main_window.show()
-        self.main_window.bring_to_front()
-
-        logger.debug(f'show_main_window end')
-
     def exec(self):
         logger.info('app.exec()')
         import signal

{ok_script-2.0.23b1 → ok_script-3.0.0}/ok/core/events.py

@@ -45,6 +45,10 @@ class EventSignal:
             elif callback in self._subscribers:
                 self._subscribers.remove(callback)
 
+    def disconnect_where(self, predicate: Callable[[Callable[..., Any]], bool]) -> None:
+        with self._lock:
+            self._subscribers = [callback for callback in self._subscribers if not predicate(callback)]
+
     def emit(self, *args: Any, **kwargs: Any) -> None:
         with self._lock:
             subscribers = tuple(self._subscribers)
@@ -94,6 +98,12 @@ class EventBus:
             self.any.emit(EventMessage(name, args, kwargs))
         return forward
 
+    def disconnect_where(self, predicate: Callable[[Callable[..., Any]], bool]) -> None:
+        """Remove every subscriber of every event for which ``predicate`` is true."""
+        self.any.disconnect_where(predicate)
+        for name in self._event_names:
+            getattr(self, name).disconnect_where(predicate)
+
     def emit_draw_box(self, key=None, boxes=None, color=None, frame=None, debug=True):
         self.draw_box.emit(key, boxes, color, frame, debug)
 

{ok_script-2.0.23b1 → ok_script-3.0.0}/ok/ui/qt/MainWindow.py

@@ -2,7 +2,7 @@ import os
 import threading
 
 import pyappify
-from PySide6.QtCore import QCoreApplication, QEvent, QSize, Qt, QTimer
+from PySide6.QtCore import QCoreApplication, QEvent, QObject, QSize, Qt, QTimer
 from PySide6.QtGui import QColor
 from PySide6.QtWidgets import QApplication, QHBoxLayout, QMenu, QStackedWidget, QSystemTrayIcon, QVBoxLayout
 
@@ -31,9 +31,10 @@ 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
 from ok.ui.qt.shell.nav_icons import nav_icon
 from ok.ui.qt.shell.run_bar import RunBar
 from ok.ui.qt.util.Alert import alert_error
@@ -46,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"
@@ -114,10 +113,11 @@ 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 = []
+        self.global_config_tabs = []  # [(config, LazyPage)]
 
         # Prepare custom tabs and separate them by add_after_default_tabs
         before_custom_tabs = []
@@ -155,9 +155,13 @@ class MainWindow(KitWindow):
             self.edit_task_tab = EditTaskTab()
             self.add_page(self.edit_task_tab, "pen", self.tr('Script'), SECTION_DEVELOP)
 
+        # Settings, Templates and global config pages are rarely opened, so they are
+        # built on first use (LazyPage) to keep window construction fast.
         if og.task_manager.has_custom or debug:
-            from ok.ui.qt.tasks.TemplateTab import TemplateTab
-            self.template_tab = TemplateTab(config=config)
+            def template_tab():
+                from ok.ui.qt.tasks.TemplateTab import TemplateTab
+                return TemplateTab(config=config)
+            self.template_tab = LazyPage(template_tab)
             self.add_page(self.template_tab, "image", self.tr('Templates'), SECTION_DEVELOP)
 
         from ok.ui.qt.debug.diagnosis_page import DiagnosisPage
@@ -192,9 +196,11 @@ class MainWindow(KitWindow):
         notification_tab = None
         for name, config_obj, option in global_config.get_all_visible_configs():
             if getattr(option, 'show_at_tab', False):
-                from ok.ui.qt.settings.GlobalConfigTab import GlobalConfigTab
-                config_tab = GlobalConfigTab(config_obj, option)
-                self.global_config_tabs.append(config_tab)
+                def global_config_tab(config_obj=config_obj, option=option):
+                    from ok.ui.qt.settings.GlobalConfigTab import GlobalConfigTab
+                    return GlobalConfigTab(config_obj, option)
+                config_tab = LazyPage(global_config_tab)
+                self.global_config_tabs.append((config_obj, config_tab))
                 if name == NOTIFICATION_OPTION_NAME:
                     notification_tab = config_tab
                 else:
@@ -204,8 +210,10 @@ class MainWindow(KitWindow):
             self.notification_tab = notification_tab
             self.add_page(notification_tab, "bell", self.app.tr(NOTIFICATION_OPTION_NAME), SECTION_GAME)
 
-        from ok.ui.qt.settings.settings_page import SettingsPage
-        self.setting_tab = SettingsPage()
+        def settings_page():
+            from ok.ui.qt.settings.settings_page import SettingsPage
+            return SettingsPage()
+        self.setting_tab = LazyPage(settings_page)
         self.add_page(self.setting_tab, "gear", self.tr('Settings'), bottom=True)
 
         from ok.ui.qt.about.AboutTab import AboutTab
@@ -275,6 +283,8 @@ class MainWindow(KitWindow):
     def switch_to(self, widget):
         if self.stack.indexOf(widget) < 0:
             return
+        if isinstance(widget, LazyPage):
+            widget.page()
         self.stack.setCurrentWidget(widget)
         self.navigation.set_current(widget.objectName())
 
@@ -442,12 +452,12 @@ class MainWindow(KitWindow):
                 logger.debug(f'bring_to_front native activation failed: {e}')
 
     def goto_global_config(self, key):
-        for config_tab in self.global_config_tabs:
-            if config_tab.has_key(key):
+        for config_obj, config_tab in self.global_config_tabs:
+            if key in config_obj:
                 self.switch_to(config_tab)
                 return
         self.switch_to(self.setting_tab)
-        self.setting_tab.goto_config(key)
+        self.setting_tab.page().goto_config(key)
 
     def tray_quit(self):
         logger.info('main window tray_quit')
@@ -669,6 +679,30 @@ class MainWindow(KitWindow):
                 except Exception as e:
                     logger.error(f'Error importing .okscript file: {e}')
 
+    def dispose(self):
+        """Release app-wide hooks so a replacement window can take over, e.g. after a language change."""
+        if self.update_check_timer is not None:
+            self.update_check_timer.stop()
+        self.tray.hide()
+        self.run_bar.dispose()
+        notification_manager = getattr(self, 'notification_manager', None)
+        if notification_manager is not None:
+            # Stopping waits for the pipeline thread; keep the GUI thread free.
+            threading.Thread(target=notification_manager.stop, name='NotificationStop', daemon=True).start()
+        controller = getattr(self, '_imported_tab_controller', None)
+        if controller is not None:
+            controller.dispose()
+        for page in list(self._pages.values()):
+            cleanup = getattr(page, 'dispose', None) or getattr(page, 'stop_worker', None)
+            if callable(cleanup):
+                try:
+                    cleanup()
+                except Exception as error:
+                    logger.error(f'Failed to dispose page {page.objectName()}', error)
+        # The event bus holds strong references; drop the ones owned by this window's widgets.
+        owners = {id(obj) for obj in (self, *self.findChildren(QObject))}
+        communicate.disconnect_where(lambda callback: id(getattr(callback, '__self__', None)) in owners)
+
     def closeEvent(self, event):
         if self.app.exit_event.is_set():
             logger.info("Window closed exit_event.is_set")

{ok_script-2.0.23b1 → ok_script-3.0.0}/ok/ui/qt/common/config.py

@@ -39,13 +39,13 @@ def deserialize_language(value) -> Language:
 
 
 class UiConfig(QObject):
-    """The language (applied on restart) and the theme mode (applied live).
+    """The language and the theme mode, both applied live.
 
     The file also accepts the older qfluentwidgets layout
     (``MainWindow.Language`` and ``QFluentWidgets.ThemeMode``).
     """
 
-    restart_required = Signal()
+    language_changed = Signal()
     theme_changed = Signal()
 
     def __init__(self, path: str):
@@ -83,7 +83,7 @@ class UiConfig(QObject):
             return
         self.language = language
         self.save()
-        self.restart_required.emit()
+        self.language_changed.emit()
 
     def set_theme_mode(self, mode: str) -> None:
         mode = getattr(mode, "value", mode)

{ok_script-2.0.23b1 → ok_script-3.0.0}/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-2.0.23b1 → ok_script-3.0.0}/ok/ui/qt/kit/buttons.py

@@ -6,7 +6,7 @@ from ok.ui.qt.kit.icons import icon as kit_icon
 from ok.ui.qt.kit.theme import set_style_property, theme
 
 VARIANTS = ("secondary", "primary", "tonal", "subtle", "danger")
-SIZES = {"normal": (36, 14, 16), "small": (30, 10, 14)}
+SIZES = {"normal": (36, 14, 18), "small": (30, 10, 16)}
 
 _ICON_COLOR = {"primary": "on_accent", "danger": "danger"}
 
@@ -48,7 +48,8 @@ class Button(QPushButton):
         height, padding, _ = SIZES[size]
         layout = QHBoxLayout(self)
         layout.setContentsMargins(padding, 0, padding, 0)
-        layout.setSpacing(8)
+        # Glyphs leave a few pixels of air inside their box, so this reads wider than it is.
+        layout.setSpacing(5)
         layout.addStretch(1)
         layout.addWidget(self._icon_label)
         layout.addWidget(self._text_label)

{ok_script-2.0.23b1 → ok_script-3.0.0}/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-2.0.23b1 → ok_script-3.0.0}/ok/ui/qt/kit/icons.py

@@ -17,9 +17,10 @@ from PySide6.QtGui import QColor, QIcon, QIconEngine, QImage, QPainter, QPixmap
 from PySide6.QtSvg import QSvgRenderer
 
 _PATHS = {
-    "play": '<path d="M7 4.5v15l12-7.5z" fill="currentColor" stroke="none"/>',
-    "pause": '<path d="M8 5v14M16 5v14"/>',
-    "stop": '<rect x="6" y="6" width="12" height="12" rx="2" fill="currentColor" stroke="none"/>',
+    "play": '<path d="M7 3.5v17L20.5 12z" fill="currentColor" stroke="currentColor" stroke-width="1.5"/>',
+    "pause": '<rect x="5.5" y="4" width="4.5" height="16" rx="1.25" fill="currentColor" stroke="none"/>'
+             '<rect x="14" y="4" width="4.5" height="16" rx="1.25" fill="currentColor" stroke="none"/>',
+    "stop": '<rect x="4.5" y="4.5" width="15" height="15" rx="2.5" fill="currentColor" stroke="none"/>',
     "power": '<path d="M12 3v9M6.3 6.8a8 8 0 1 0 11.4 0"/>',
     "check": '<path d="M5 12.5l4.5 4.5L19 7"/>',
     "x": '<path d="M6 6l12 12M18 6 6 18"/>',
@@ -219,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.
 
@@ -230,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:
@@ -261,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-2.0.23b1 → ok_script-3.0.0}/ok/ui/qt/kit/qss.py

@@ -218,12 +218,13 @@ QAbstractItemView {{
     selection-color: {text};
     outline: 0;
 }}
+QTableView::item {{ padding: 0 12px; }}
 QHeaderView::section {{
     background: {surface_alt};
     color: {text_secondary};
     border: 0;
     border-bottom: 1px solid {border};
-    padding: 6px 10px;
+    padding: 6px 12px;
     font-weight: 600;
 }}
 
@@ -387,6 +388,11 @@ QLabel#taskTile {{
     font-size: 12px;
     font-weight: 600;
 }}
+TaskIconTile#taskTile {{
+    background: transparent;
+    border: 0;
+    border-radius: 0;
+}}
 QPushButton#sectionHeader {{
     background: transparent;
     border: 0;

{ok_script-2.0.23b1 → ok_script-3.0.0}/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-2.0.23b1 → ok_script-3.0.0}/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):