ok-script 2.0.0b7__tar.gz → 2.0.2__tar.gz

ok_script-2.0.2/LICENSE.txt

@@ -0,0 +1,73 @@
+ok-script License
+================
+
+Copyright (c) 2026 ok-oldking
+
+This project is licensed under the Apache License, Version 2.0, as modified
+by the Commons Clause License Condition v1.0 and the additional terms below.
+The Apache License, Version 2.0, is available at:
+
+https://www.apache.org/licenses/LICENSE-2.0
+
+The Commons Clause License Condition v1.0 is available at:
+
+https://commonsclause.com/
+
+If there is a conflict between the Apache License 2.0 and the Commons Clause
+or additional terms below, the Commons Clause and additional terms control.
+
+Commons Clause
+-------------
+
+Without limiting the conditions of the Apache License 2.0, the grant of
+rights under that license does not include the right to Sell this Software.
+
+For this license, “Sell” means selling, lending, leasing, licensing, offering
+for sale, lease, or license, or otherwise transferring this Software to a
+third party for a fee or other consideration. “Sell” does not include:
+
+* Using the Software internally, including by an organization or its
+  employees, without transferring it to a third party for a fee or other
+  consideration; or
+* Distributing the Software as part of a larger application or product,
+  provided that the larger application or product is not primarily the
+  Software or a competing product.
+
+Additional Terms
+----------------
+
+1. You may use this Software in closed-source and commercial projects. You
+   may charge for your own application, service, support, or other material
+   that incorporates the Software, provided that you do not sell or offer the
+   Software itself, or a competing product based primarily on it, as a product.
+
+2. You may fork the Software, make improvements, and keep the fork open
+   source and freely available. You may not take this project, rename it or
+   make only minor changes, and sell or market it as a competing product.
+
+3. You may not use this Software for hacking, unauthorized access, malware,
+   fraud, or any other illegal activity. You are responsible for complying
+   with all applicable laws and obtaining authorization for any security or
+   automation activity.
+
+4. Any project that uses, incorporates, or is derived from this Software
+   must mention ok-script and link to at least one of the following in at
+   least one of the project's website, GitHub repository, or the software
+   itself:
+
+   * Website: https://ok-script.com/
+   * GitHub: https://github.com/ok-oldking/ok-script
+
+   The notice must be reasonably visible and retained in modified or
+   redistributed versions.
+
+5. Use of the Qt UI, including components based on PyQt-Fluent-Widgets or
+   its related packages, is separately subject to the license and terms of
+   the upstream project:
+
+   https://github.com/zhiyiYo/PyQt-Fluent-Widgets
+
+6. Except for these additional terms, the Apache License 2.0 applies,
+   including its copyright, notice, patent, warranty, and liability
+   provisions. The Software is provided “AS IS”, without warranties or
+   conditions of any kind.

{ok_script-2.0.0b7/ok_script.egg-info → ok_script-2.0.2}/PKG-INFO

@@ -1,8 +1,82 @@
 Metadata-Version: 2.4
 Name: ok-script
-Version: 2.0.0b7
+Version: 2.0.2
 Summary: Automation with Computer Vision for Python
 Author-email: ok-oldking <firedcto@gmail.com>
+License: ok-script License
+        ================
+        
+        Copyright (c) 2026 ok-oldking
+        
+        This project is licensed under the Apache License, Version 2.0, as modified
+        by the Commons Clause License Condition v1.0 and the additional terms below.
+        The Apache License, Version 2.0, is available at:
+        
+        https://www.apache.org/licenses/LICENSE-2.0
+        
+        The Commons Clause License Condition v1.0 is available at:
+        
+        https://commonsclause.com/
+        
+        If there is a conflict between the Apache License 2.0 and the Commons Clause
+        or additional terms below, the Commons Clause and additional terms control.
+        
+        Commons Clause
+        -------------
+        
+        Without limiting the conditions of the Apache License 2.0, the grant of
+        rights under that license does not include the right to Sell this Software.
+        
+        For this license, “Sell” means selling, lending, leasing, licensing, offering
+        for sale, lease, or license, or otherwise transferring this Software to a
+        third party for a fee or other consideration. “Sell” does not include:
+        
+        * Using the Software internally, including by an organization or its
+          employees, without transferring it to a third party for a fee or other
+          consideration; or
+        * Distributing the Software as part of a larger application or product,
+          provided that the larger application or product is not primarily the
+          Software or a competing product.
+        
+        Additional Terms
+        ----------------
+        
+        1. You may use this Software in closed-source and commercial projects. You
+           may charge for your own application, service, support, or other material
+           that incorporates the Software, provided that you do not sell or offer the
+           Software itself, or a competing product based primarily on it, as a product.
+        
+        2. You may fork the Software, make improvements, and keep the fork open
+           source and freely available. You may not take this project, rename it or
+           make only minor changes, and sell or market it as a competing product.
+        
+        3. You may not use this Software for hacking, unauthorized access, malware,
+           fraud, or any other illegal activity. You are responsible for complying
+           with all applicable laws and obtaining authorization for any security or
+           automation activity.
+        
+        4. Any project that uses, incorporates, or is derived from this Software
+           must mention ok-script and link to at least one of the following in at
+           least one of the project's website, GitHub repository, or the software
+           itself:
+        
+           * Website: https://ok-script.com/
+           * GitHub: https://github.com/ok-oldking/ok-script
+        
+           The notice must be reasonably visible and retained in modified or
+           redistributed versions.
+        
+        5. Use of the Qt UI, including components based on PyQt-Fluent-Widgets or
+           its related packages, is separately subject to the license and terms of
+           the upstream project:
+        
+           https://github.com/zhiyiYo/PyQt-Fluent-Widgets
+        
+        6. Except for these additional terms, the Apache License 2.0 applies,
+           including its copyright, notice, patent, warranty, and liability
+           provisions. The Software is provided “AS IS”, without warranties or
+           conditions of any kind.
+        
 Project-URL: Homepage, https://github.com/ok-oldking/ok-script
 Project-URL: Repository, https://github.com/ok-oldking/ok-script
 Classifier: Programming Language :: Python :: 3
@@ -15,7 +89,7 @@ Classifier: Operating System :: Microsoft :: Windows
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
-Requires-Dist: pywin32>=306
+Requires-Dist: pywin32!=312,>=306
 Requires-Dist: pyappify>=1.0.9
 Requires-Dist: typing-extensions>=4.11.0
 Requires-Dist: requests>=2.32.3
@@ -157,6 +231,36 @@ python -m pip install --editable . --group default --group dev
 - [PyPI](https://pypi.org/project/ok-script/)
 - [GitHub](https://github.com/ok-oldking/ok-script)
 
+## 致谢
+
+ok-script 的开发离不开以下开源项目：
+
+- [PyAppify](https://github.com/ok-oldking/pyappify)：用于应用更新和打包。
+- [OnnxOCR](https://github.com/ok-oldking/OnnxOCR)：提供支持 Intel NPU 的 OCR，
+  支持通过 OpenVINO 或 ONNX Runtime 推理，并使用 PaddleOCR v5 模型。
+- [PySide6](https://wiki.qt.io/Qt_for_Python)：提供基于 Qt 的桌面界面绑定。
+- [PyQt-Fluent-Widgets](https://github.com/zhiyiYo/PyQt-Fluent-Widgets)：Qt
+  界面使用的 Fluent UI 组件。
+- [OpenCV](https://opencv.org/)、[NumPy](https://numpy.org/) 和
+  [Pillow](https://python-pillow.org/)：用于图像处理和计算机视觉。
+- [FastAPI](https://fastapi.tiangolo.com/)、[Uvicorn](https://www.uvicorn.org/)
+  和 [pywebview](https://pywebview.flowrl.com/)：用于 Web 界面支持。
+- [adbutils](https://github.com/openatx/adbutils)：用于 Android 设备连接。
+
+上述依赖均受其各自许可证约束，详情请参阅对应项目页面。
+
 ## 许可证
 
-本项目采用 [AGPL-3.0 许可证](LICENSE.txt)。
+本项目采用 [Apache License 2.0 + Commons Clause 及附加条款](LICENSE.txt)。
+
+允许的使用方式：
+
+- 可用于闭源项目或商业项目。
+- 可以 fork、本项目改进，并保持 fork 开源且免费。
+
+限制：
+
+- 禁止直接出售本项目，或仅改名、稍作修改后将其作为竞争产品出售或推广。
+- 禁止将本项目用于黑客攻击、未授权访问、恶意软件、欺诈或其他违法活动。
+- 任何使用 ok-script 的项目，都必须在项目网站、GitHub 或软件本身至少一处提及并链接 [ok-script.com](https://ok-script.com/) 或 [ok-script GitHub](https://github.com/ok-oldking/ok-script)。
+- Qt UI 的使用还必须遵守 [PyQt-Fluent-Widgets](https://github.com/zhiyiYo/PyQt-Fluent-Widgets) 的许可证。

{ok_script-2.0.0b7 → ok_script-2.0.2}/README.md

@@ -102,6 +102,36 @@ python -m pip install --editable . --group default --group dev
 - [PyPI](https://pypi.org/project/ok-script/)
 - [GitHub](https://github.com/ok-oldking/ok-script)
 
+## 致谢
+
+ok-script 的开发离不开以下开源项目：
+
+- [PyAppify](https://github.com/ok-oldking/pyappify)：用于应用更新和打包。
+- [OnnxOCR](https://github.com/ok-oldking/OnnxOCR)：提供支持 Intel NPU 的 OCR，
+  支持通过 OpenVINO 或 ONNX Runtime 推理，并使用 PaddleOCR v5 模型。
+- [PySide6](https://wiki.qt.io/Qt_for_Python)：提供基于 Qt 的桌面界面绑定。
+- [PyQt-Fluent-Widgets](https://github.com/zhiyiYo/PyQt-Fluent-Widgets)：Qt
+  界面使用的 Fluent UI 组件。
+- [OpenCV](https://opencv.org/)、[NumPy](https://numpy.org/) 和
+  [Pillow](https://python-pillow.org/)：用于图像处理和计算机视觉。
+- [FastAPI](https://fastapi.tiangolo.com/)、[Uvicorn](https://www.uvicorn.org/)
+  和 [pywebview](https://pywebview.flowrl.com/)：用于 Web 界面支持。
+- [adbutils](https://github.com/openatx/adbutils)：用于 Android 设备连接。
+
+上述依赖均受其各自许可证约束，详情请参阅对应项目页面。
+
 ## 许可证
 
-本项目采用 [AGPL-3.0 许可证](LICENSE.txt)。
+本项目采用 [Apache License 2.0 + Commons Clause 及附加条款](LICENSE.txt)。
+
+允许的使用方式：
+
+- 可用于闭源项目或商业项目。
+- 可以 fork、本项目改进，并保持 fork 开源且免费。
+
+限制：
+
+- 禁止直接出售本项目，或仅改名、稍作修改后将其作为竞争产品出售或推广。
+- 禁止将本项目用于黑客攻击、未授权访问、恶意软件、欺诈或其他违法活动。
+- 任何使用 ok-script 的项目，都必须在项目网站、GitHub 或软件本身至少一处提及并链接 [ok-script.com](https://ok-script.com/) 或 [ok-script GitHub](https://github.com/ok-oldking/ok-script)。
+- Qt UI 的使用还必须遵守 [PyQt-Fluent-Widgets](https://github.com/zhiyiYo/PyQt-Fluent-Widgets) 的许可证。

{ok_script-2.0.0b7 → ok_script-2.0.2}/ok/__init__.py

@@ -287,6 +287,7 @@ class App(_OverlayConfigMixin):
         from ok.ui.qt.util.app import init_app_config
         self.app, self.locale = init_app_config()
         install_qt_event_dispatcher()
+        self.app.aboutToQuit.connect(self._close_device_manager)
         if task_executor is not None:
             task_executor.locale = self.locale
             task_executor.load_tr()
@@ -335,9 +336,16 @@ class App(_OverlayConfigMixin):
         if self.overlay_window is not None:
             self.overlay_window.close()
         self.exit_event.set()
+        self._close_device_manager()
         from PySide6.QtCore import QMetaObject, Qt
         QMetaObject.invokeMethod(self.app, "quit", Qt.QueuedConnection)
 
+    @staticmethod
+    def _close_device_manager():
+        device_manager = getattr(og, 'device_manager', None)
+        if device_manager is not None:
+            device_manager.close()
+
     def tr(self, key):
         from PySide6.QtCore import QCoreApplication
 

{ok_script-2.0.0b7 → ok_script-2.0.2}/ok/device/DeviceManager.py

@@ -129,6 +129,16 @@ class DeviceManager:
             if self.hwnd_window.exe_full_path:
                 kill_exe(abs_path=self.hwnd_window.exe_full_path)
 
+    def close(self):
+        """Stop capture resources before Qt/Python teardown begins."""
+        capture_method = self.capture_method
+        self.capture_method = None
+        if capture_method is not None:
+            try:
+                capture_method.close()
+            except Exception as e:
+                logger.error(f'capture method close failed: {e}')
+
     def select_hwnd(self, exe, hwnd):
         self.config['selected_exe'] = exe
         self.config['selected_hwnd'] = hwnd

{ok_script-2.0.0b7 → ok_script-2.0.2}/ok/device/capture_methods/bitblt.py

@@ -8,6 +8,7 @@ from ok.device.capture_methods.bitblt_utils import (
     capture_by_bitblt,
     capture_desktop_by_bitblt,
     clean_up_desktop_bitblt,
+    clean_up_bitblt,
     composite_hwnds,
     get_crop_point,
 )
@@ -58,6 +59,19 @@ class BitBltCaptureMethod(BaseWindowsCaptureMethod):
     def get_name(self):
         return f'BitBlt_{render_full}'
 
+    def close(self):
+        """Release all GDI objects before the interpreter starts shutting down.
+
+        BitBlt contexts are used by the main capture and by any child windows
+        composited on top of it.  Leaving them for Python/pywin32 finalization
+        can race with the capture thread and cause a native access violation.
+        """
+        with self.lock:
+            clean_up_bitblt(self)
+            for context in self.contexts.values():
+                clean_up_bitblt(context)
+            self.contexts.clear()
+
     def test_exclusive_full_screen(self):
         frame = self.do_get_frame()
         if frame is None:

{ok_script-2.0.0b7 → ok_script-2.0.2}/ok/device/capture_methods/windows_graphics.py

@@ -10,7 +10,12 @@ from ok.util.window import WINDOWS_BUILD_NUMBER, WGC_NO_BORDER_MIN_BUILD
 
 from ok.device.capture_methods import bitblt
 from ok.device.capture_methods.base import BaseWindowsCaptureMethod
-from ok.device.capture_methods.bitblt_utils import PBYTE, composite_hwnds, get_crop_point
+from ok.device.capture_methods.bitblt_utils import (
+    PBYTE,
+    clean_up_bitblt,
+    composite_hwnds,
+    get_crop_point,
+)
 
 logger = Logger.get_logger(__name__)
 
@@ -24,7 +29,9 @@ class WindowsGraphicsCaptureMethod(BaseWindowsCaptureMethod):
     def __init__(self, hwnd_window):
         super().__init__(hwnd_window)
         self.lock = threading.RLock()
-        self.get_frame_lock = threading.Lock()
+        # close() may be requested by start_or_stop() while _do_get_frame()
+        # already owns this lock (for example after a target-window change).
+        self.get_frame_lock = threading.RLock()
         self.frame_event = threading.Event()
         self.frame_requested = threading.Event()
         self.last_frame_time = time.time()
@@ -247,31 +254,38 @@ class WindowsGraphicsCaptureMethod(BaseWindowsCaptureMethod):
         self.evtoken = None
 
     def close(self):
-        with self.lock:
-            logger.info('destroy windows capture')
-            self.frame_requested.clear()
-            self.frame_event.set()
-            if self.frame_pool is not None:
-                self.frame_pool.Close()
-                self.frame_pool = None
-            if self.session is not None:
-                self.session.Close()
-                self.session = None
-            self.item = None
-            if self.rtdevice:
-                self.rtdevice.Release()
-                self.rtdevice = None
-            if self.dxdevice:
-                self.dxdevice.Release()
-                self.dxdevice = None
-            if self.immediatedc:
-                self.immediatedc.Release()
-                self.immediatedc = None
-            if self.cputex:
-                self.cputex.Release()
-                self.cputex = None
-            self.capture_hwnd = 0
-            self.capture_target_signature = None
+        # _do_get_frame() composites child windows with BitBlt after receiving
+        # the WGC frame. Serialize close with that whole request so its GDI
+        # contexts cannot be released while composite_hwnds() is using them.
+        with self.get_frame_lock:
+            with self.lock:
+                logger.info('destroy windows capture')
+                self.frame_requested.clear()
+                self.frame_event.set()
+                if self.frame_pool is not None:
+                    self.frame_pool.Close()
+                    self.frame_pool = None
+                if self.session is not None:
+                    self.session.Close()
+                    self.session = None
+                self.item = None
+                if self.rtdevice:
+                    self.rtdevice.Release()
+                    self.rtdevice = None
+                if self.dxdevice:
+                    self.dxdevice.Release()
+                    self.dxdevice = None
+                if self.immediatedc:
+                    self.immediatedc.Release()
+                    self.immediatedc = None
+                if self.cputex:
+                    self.cputex.Release()
+                    self.cputex = None
+                for context in self.contexts.values():
+                    clean_up_bitblt(context)
+                self.contexts.clear()
+                self.capture_hwnd = 0
+                self.capture_target_signature = None
 
     def do_get_frame(self):
         # frame_requested and last_frame represent one in-flight request. Keep

{ok_script-2.0.0b7 → ok_script-2.0.2}/ok/ui/qt/MainWindow.py

@@ -46,6 +46,7 @@ logger = Logger.get_logger(__name__)
 
 NAVIGATION_EXPAND_MAX_WIDTH = 240
 NAVIGATION_EXPAND_FIT_PADDING = 23
+DEFAULT_THEME_COLOR = qconfig.themeColor.defaultValue
 
 
 def update_check_delay_ms():
@@ -62,6 +63,7 @@ class MainWindow(FluentWindow):
         self.stackedWidget.setAnimationEnabled(False)
         self._theme_cooldowns = set()
         logger.info('main window __init__')
+        self._configured_theme_color = DEFAULT_THEME_COLOR
         self._sync_system_accent_color(refresh=True)
         qconfig.themeChanged.connect(self._on_theme_changed)
         navigation_scroll_area = self.navigationInterface.panel.scrollArea
@@ -323,6 +325,15 @@ class MainWindow(FluentWindow):
         return QColor(red, green, blue)
 
     def _sync_system_accent_color(self, refresh=False):
+        if qconfig.themeMode.value != Theme.AUTO:
+            configured_color = getattr(self, '_configured_theme_color', None)
+            if configured_color is None or qconfig.get(qconfig.themeColor) == configured_color:
+                return False
+            qconfig.set(qconfig.themeColor, configured_color, save=False)
+            if refresh:
+                updateStyleSheet()
+            return True
+
         color = self.get_system_primary_theme_color()
         if color is None or color == qconfig.get(qconfig.themeColor):
             return False

{ok_script-2.0.0b7 → ok_script-2.0.2}/ok/ui/qt/about/AboutTab.py

@@ -28,8 +28,10 @@ class AboutTab(Tab):
 
         self.update_card = None
         if callable(getattr(pyappify_module, 'get_version_list', None)):
+            links = config.get('links') or {}
             self.update_card = UpdateCard(
-                config.get('version'), pyappify_module, self, exit_event=exit_event
+                config.get('version'), pyappify_module, self, exit_event=exit_event,
+                download_url=get_localized_app_config(links, 'download'),
             )
             self.add_card(self.tr("App update"), self.update_card)
         else:
@@ -54,16 +56,16 @@ class AboutTab(Tab):
             self.add_card(self.tr("Disclaimer"), about_label)
 
         projects = [
-            {"name": self.tr("ok-py Automation Tool"), "url": "https://github.com/ok-oldking/ok-py"},
-            {"name": self.tr("ok-script App Template"), "url": "https://github.com/ok-oldking/ok-script-app"},
-            {"name": self.tr("Wuthering Waves"), "url": "https://github.com/ok-oldking/ok-wuthering-waves"},
+            {"name": "ok-script", "url": "https://github.com/ok-oldking/ok-script", "website": "https://ok-script.com/"},
+            {"name": self.tr("ok-script App Template"), "url": "https://github.com/ok-oldking/ok-script-app", "website": "https://app.ok-script.com/"},
+            {"name": self.tr("Wuthering Waves"), "url": "https://github.com/ok-oldking/ok-wuthering-waves", "website": "https://ok-ww.ok-script.com/"},
             {"name": self.tr("Girls' Frontline 2"), "url": "https://github.com/ok-oldking/ok-gf2"},
-            {"name": self.tr("Star Resonance"), "url": "https://github.com/Sanheiii/ok-star-resonance"},
+            {"name": self.tr("Star Resonance"), "url": "https://github.com/Sanheiii/ok-star-resonance", "website": "https://ok-script.com/ok-star-resonance/"},
             {"name": self.tr("Duet Night Abyss"), "url": "https://github.com/BnanZ0/ok-duet-night-abyss"},
-            {"name": self.tr("Chaos Zero Nightmare"), "url": "https://github.com/baoxin1100/ok-kes"},
-            {"name": self.tr("Onmyoji"), "url": "https://github.com/YunLiuZ/ok-Onmyoji"},
-            {"name": self.tr("Arknights: Endfield"), "url": "https://github.com/AliceJump/ok-end-field"},
-            {"name": self.tr("Neverness to Everness"), "url": "https://github.com/BnanZ0/ok-neverness-to-everness"},
+            {"name": self.tr("Chaos Zero Nightmare"), "url": "https://github.com/baoxin1100/ok-kes", "website": "https://ok-script.com/ok-kes/"},
+            {"name": self.tr("Onmyoji"), "url": "https://github.com/YunLiuZ/ok-Onmyoji", "website": "https://ok-script.com/ok-onmyoji/"},
+            {"name": self.tr("Arknights: Endfield"), "url": "https://github.com/AliceJump/ok-end-field", "website": "https://ok-script.com/ok-end-field/"},
+            {"name": self.tr("Neverness to Everness"), "url": "https://github.com/BnanZ0/ok-neverness-to-everness", "website": "https://ok-script.com/ok-nte/"},
         ]
 
         def normalize_url(url):
@@ -82,10 +84,12 @@ class AboutTab(Tab):
             grid_layout.setContentsMargins(0, 0, 0, 0)
             grid_layout.setHorizontalSpacing(12)
             grid_layout.setVerticalSpacing(12)
+            grid_layout.setColumnStretch(0, 1)
+            grid_layout.setColumnStretch(1, 1)
             grid_layout.setAlignment(Qt.AlignTop)
 
             for i, project in enumerate(filtered_projects):
-                card = ProjectCard(project['name'], project['url'], grid_widget)
+                card = ProjectCard(project['name'], project['url'], project.get('website'), grid_widget)
                 grid_layout.addWidget(card, i // 2, i % 2)
 
             self.group = self.add_card(self.tr("Other Projects"), grid_widget)

{ok_script-2.0.0b7 → ok_script-2.0.2}/ok/ui/qt/about/LinksBar.py

@@ -25,6 +25,12 @@ class LinksBar(QWidget):
             self.github_button.clicked.connect(lambda: QDesktopServices.openUrl(QUrl(github_url)))
             self.layout.addWidget(self.github_button, alignment=Qt.AlignRight, stretch=0)
 
+        download_url = self.get_url('download')
+        if download_url:
+            self.download_button = PushButton(self.tr("Download"), icon=FluentIcon.DOWNLOAD)
+            self.download_button.clicked.connect(lambda: self.open_url('download'))
+            self.layout.addWidget(self.download_button, alignment=Qt.AlignRight, stretch=0)
+
         if self.get_url('discord'):
             self.discord_button = PushButton(self.tr("Discord"), icon=OKIcon.DISCORD)
             self.discord_button.clicked.connect(lambda: self.open_url('discord'))

ok_script-2.0.2/ok/ui/qt/about/ProjectCard.py

@@ -0,0 +1,42 @@
+from PySide6.QtCore import QUrl, Qt
+from PySide6.QtGui import QDesktopServices, QFontMetrics
+from PySide6.QtWidgets import QSizePolicy
+from qfluentwidgets import SettingCard, FluentIcon, PushButton
+
+
+class ProjectCard(SettingCard):
+    def __init__(self, name, url, website=None, parent=None):
+        super().__init__(FluentIcon.GITHUB, name, url)
+        self.setParent(parent)
+        self.url = url
+        self.iconLabel.hide()  # Remove icon as per user request
+        self.contentLabel.setMinimumWidth(0)
+        self.contentLabel.setMaximumWidth(150)
+        self.contentLabel.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Preferred)
+        self.contentLabel.setText(QFontMetrics(self.contentLabel.font()).elidedText(
+            url, Qt.TextElideMode.ElideMiddle, 320
+        ))
+        self.contentLabel.setToolTip(url)
+        self.setMinimumWidth(0)
+        self.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Fixed)
+        for label in (self.titleLabel, self.contentLabel):
+            font = label.font()
+            font.setPointSize(7)
+            label.setFont(font)
+        self.hBoxLayout.setSpacing(6)
+        self.github_button = PushButton(self.tr("GitHub"), self, icon=FluentIcon.GITHUB)
+        self.github_button.clicked.connect(self.open_url)
+        self.hBoxLayout.addWidget(self.github_button)
+        self.website = website
+        if website:
+            self.download_button = PushButton(self.tr("Download"), self, icon=FluentIcon.DOWNLOAD)
+            self.download_button.clicked.connect(self.open_website)
+            self.hBoxLayout.addWidget(self.download_button)
+        self.hBoxLayout.addSpacing(11)
+        self.setFixedHeight(72)
+
+    def open_url(self):
+        QDesktopServices.openUrl(QUrl(self.url))
+
+    def open_website(self):
+        QDesktopServices.openUrl(QUrl(self.website))

{ok_script-2.0.0b7 → ok_script-2.0.2}/ok/ui/qt/about/UpdateCard.py

@@ -1,8 +1,8 @@
 import os
 import threading
 
-from PySide6.QtCore import QEvent, Signal, Qt
-from PySide6.QtGui import QFontMetrics, QIcon, QPixmap
+from PySide6.QtCore import QEvent, QUrl, Signal, Qt
+from PySide6.QtGui import QDesktopServices, QFontMetrics, QIcon, QPixmap
 from PySide6.QtWidgets import QHBoxLayout, QSizePolicy, QVBoxLayout, QWidget
 from qfluentwidgets import BodyLabel, CheckBox, ComboBox, FluentIcon, IndeterminateProgressRing, \
     PrimaryPushButton, PushButton
@@ -51,7 +51,7 @@ class UpdateCard(QWidget):
     VERSION_COMBO_MIN_WIDTH = 100
     VERSION_COMBO_MAX_WIDTH = 240
 
-    def __init__(self, current_version, pyappify_module, parent=None, exit_event=None):
+    def __init__(self, current_version, pyappify_module, parent=None, exit_event=None, download_url=None):
         super().__init__(parent)
         self.current_version = current_version or getattr(pyappify_module, "app_version", None) or ""
         if "PYAPPIFY_PYTHON_TEST" in os.environ and not _is_numeric_version(self.current_version):
@@ -59,6 +59,7 @@ class UpdateCard(QWidget):
             self.current_version = "v0.0.0"
         self.pyappify_module = pyappify_module
         self.exit_event = exit_event
+        self.download_url = download_url
         self.versions = []
         self._busy = False
         logger.info(
@@ -88,15 +89,27 @@ class UpdateCard(QWidget):
         self.update_button = PrimaryPushButton(FluentIcon.UPDATE, self.tr("Update"), self)
         self.update_button.clicked.connect(self.update_to_selected_version)
         self.update_button.setEnabled(False)
+        self.download_button = PrimaryPushButton(self.tr("Download"), self, icon=FluentIcon.DOWNLOAD)
+        self.download_button.clicked.connect(lambda: QDesktopServices.openUrl(QUrl(self.download_url)))
+        self.download_button.hide()
 
         self.controls_layout = QHBoxLayout()
-        self.controls_layout.setContentsMargins(0, 0, 0, 0)
+        self.controls_layout.setContentsMargins(0, 0, 11, 0)
+        self.controls_layout.setSpacing(6)
         self.version_label = BodyLabel(self.tr("Version"), self)
         self.status_label = BodyLabel(self.tr("Click to check for updates"), self)
+        self.status_label.setWordWrap(True)
+        self.status_label.setTextFormat(Qt.TextFormat.PlainText)
+        self.status_label.setMinimumWidth(0)
+        self.status_label.setMaximumWidth(300)
+        status_size_policy = QSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Preferred)
+        status_size_policy.setHeightForWidth(True)
+        self.status_label.setSizePolicy(status_size_policy)
         self.controls_layout.addWidget(self.version_label)
         self.controls_layout.addWidget(self.version_combo)
         self.controls_layout.addWidget(self.status_label)
         self.controls_layout.addStretch(1)
+        self.controls_layout.addWidget(self.download_button)
         self.controls_layout.addWidget(self.test_version_checkbox)
         self.controls_layout.addWidget(self.check_button)
         self.controls_layout.addWidget(self.update_button)
@@ -300,7 +313,9 @@ class UpdateCard(QWidget):
 
     def _set_status(self, message, error=False):
         self.status_label.setText(message)
+        self.status_label.setToolTip(message if error else "")
         self.status_label.setStyleSheet("color: #d13438;" if error else "")
+        self.download_button.setVisible(error and bool(self.download_url))
 
     def _compare_versions(self, left, right):
         if left == right:

{ok_script-2.0.0b7 → ok_script-2.0.2}/ok/ui/qt/about/VersionCard.py

@@ -10,6 +10,10 @@ class VersionCard(SettingCard):
         super().__init__(icon, title, f'{version} {self.get_type(debug)}')
         links_bar = LinksBar(config)
         self.iconLabel.setFixedSize(36, 36)
+        for label in (self.titleLabel, self.contentLabel):
+            font = label.font()
+            font.setPointSize(7)
+            label.setFont(font)
         self.hBoxLayout.addWidget(links_bar)
 
     def get_type(self, debug=None):

{ok_script-2.0.0b7 → ok_script-2.0.2}/ok/ui/qt/i18n/en_US.ts

@@ -314,6 +314,10 @@
             <source>Share Link copied to clipboard</source>
             <translation>Share Link copied to clipboard</translation>
         </message>
+        <message>
+            <source>Download</source>
+            <translation>Download</translation>
+        </message>
     </context>
     <context>
         <name>LogWindow</name>
@@ -3727,5 +3731,16 @@
             <source>Failed to calculate update notes: {error}</source>
             <translation>Failed to calculate update notes: {error}</translation>
         </message>
+        <message>
+            <source>Download</source>
+            <translation>Download</translation>
+        </message>
+    </context>
+    <context>
+        <name>ProjectCard</name>
+        <message>
+            <source>Download</source>
+            <translation>Download</translation>
+        </message>
     </context>
 </TS>