ok-script 0.0.7__tar.gz → 0.0.9__tar.gz

{ok-script-0.0.7 → ok-script-0.0.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ok-script
-Version: 0.0.7
+Version: 0.0.9
 Summary: Automation with Computer Vision for Python
 Home-page: https://github.com/ok-oldking/ok-script
 Author: ok-oldking
@@ -18,7 +18,7 @@ Requires-Dist: pywin32==306
 Requires-Dist: typing-extensions~=4.10.0
 Requires-Dist: PySide6~=6.6.2
 
-# autoui
+# ok-script
 
 This project aims to provide a universal framework for developing automation tool for PC/Android games, running in
 windows,

{ok-script-0.0.7 → ok-script-0.0.9}/README.md

@@ -1,4 +1,4 @@
-# autoui
+# ok-script
 
 This project aims to provide a universal framework for developing automation tool for PC/Android games, running in
 windows,

ok-script-0.0.7/autohelper/AutoHelper.py → ok-script-0.0.9/ok/OK.py

@@ -5,19 +5,19 @@ from typing import Dict, Any
 
 from PySide6.QtWidgets import QApplication
 
-import autohelper
-from autohelper.feature.FeatureSet import FeatureSet
-from autohelper.gui.App import App
-from autohelper.gui.Communicate import communicate
-from autohelper.gui.overlay.OverlayWindow import OverlayWindow
-from autohelper.gui.util.InitWorker import InitWorker
-from autohelper.logging.Logger import get_logger, config_logger
-from autohelper.task.TaskExecutor import TaskExecutor
+import ok
+from ok.feature.FeatureSet import FeatureSet
+from ok.gui.App import App
+from ok.gui.Communicate import communicate
+from ok.gui.overlay.OverlayWindow import OverlayWindow
+from ok.gui.util.InitWorker import InitWorker
+from ok.logging.Logger import get_logger, config_logger
+from ok.task.TaskExecutor import TaskExecutor
 
 logger = get_logger(__name__)
 
 
-class AutoHelper:
+class OK:
     executor: TaskExecutor
     adb = None
     adb_device = None
@@ -36,20 +36,24 @@ class AutoHelper:
         self.init_device_manager()
         if config.get("use_gui"):
             self.app = App(self.config.get('gui_icon'), self.debug, self.config.get('gui_title'),
-                           self.config['tasks'], self.exit_event)
-            autohelper.gui.app = self.app
+                           self.config['tasks'], self.config.get('about'), self.exit_event)
+            ok.gui.app = self.app
+        else:
+            self.device_manager.set_preferred_device()
+            self.device_manager.start()
+            self.do_init()
+
+    def start(self):
+        if self.config.get("use_gui"):
             self.app.show_loading()
             self.worker = InitWorker(self.do_init)
             self.worker.start()
             self.app.exec()
         else:
-            self.device_manager.set_preferred_device()
-            self.device_manager.start()
-            self.do_init()
             self.task_executor.start()
-            if config.get("debug"):
+            if self.config.get("debug"):
                 self.app = QApplication(sys.argv)
-                self.overlay_window = OverlayWindow(autohelper.gui.device_manager.hwnd)
+                self.overlay_window = OverlayWindow(ok.gui.device_manager.hwnd)
                 self.app.exec()
             else:
                 try:
@@ -101,7 +105,7 @@ class AutoHelper:
         self.init_message("TaskExecutor init Done")
 
         if self.app:
-            autohelper.gui.executor = self.task_executor
+            ok.gui.executor = self.task_executor
 
     def wait_task(self):
         while not self.exit_event.is_set():
@@ -109,8 +113,8 @@ class AutoHelper:
 
     def init_device_manager(self):
         if self.device_manager is None:
-            from autohelper.capture.adb.DeviceManager import DeviceManager
+            from ok.capture.adb.DeviceManager import DeviceManager
             self.device_manager = DeviceManager(self.config.get("config_folder") or "config",
                                                 self.config.get('capture_window_title'), self.config.get("debug"),
                                                 self.exit_event)
-            autohelper.gui.device_manager = self.device_manager
+            ok.gui.device_manager = self.device_manager

{ok-script-0.0.7/autohelper → ok-script-0.0.9/ok}/capture/HwndWindow.py

@@ -5,9 +5,9 @@ import threading
 from typing_extensions import override
 from win32 import win32gui
 
-from autohelper.capture.windows.window import is_foreground_window, get_window_bounds
-from autohelper.gui.Communicate import communicate
-from autohelper.logging.Logger import get_logger
+from ok.capture.windows.window import is_foreground_window, get_window_bounds
+from ok.gui.Communicate import communicate
+from ok.logging.Logger import get_logger
 
 logger = get_logger(__name__)
 

{ok-script-0.0.7/autohelper → ok-script-0.0.9/ok}/capture/adb/ADBCaptureMethod.py

@@ -2,8 +2,8 @@
 import numpy as np
 from typing_extensions import override
 
-from autohelper.capture.BaseCaptureMethod import BaseCaptureMethod
-from autohelper.logging.Logger import get_logger
+from ok.capture.BaseCaptureMethod import BaseCaptureMethod
+from ok.logging.Logger import get_logger
 
 logger = get_logger(__name__)
 

{ok-script-0.0.7/autohelper → ok-script-0.0.9/ok}/capture/adb/DeviceManager.py

@@ -4,15 +4,15 @@ import adbutils
 import cv2
 import numpy as np
 
-from autohelper.capture.HwndWindow import HwndWindow
-from autohelper.capture.adb.ADBCaptureMethod import ADBCaptureMethod
-from autohelper.capture.adb.vbox import installed_emulator
-from autohelper.capture.windows.WindowsGraphicsCaptureMethod import WindowsGraphicsCaptureMethod
-from autohelper.config.Config import Config
-from autohelper.gui.Communicate import communicate
-from autohelper.interaction.ADBInteraction import ADBBaseInteraction
-from autohelper.interaction.Win32Interaction import Win32Interaction
-from autohelper.logging.Logger import get_logger
+from ok.capture.HwndWindow import HwndWindow
+from ok.capture.adb.ADBCaptureMethod import ADBCaptureMethod
+from ok.capture.adb.vbox import installed_emulator
+from ok.capture.windows.WindowsGraphicsCaptureMethod import WindowsGraphicsCaptureMethod
+from ok.config.Config import Config
+from ok.gui.Communicate import communicate
+from ok.interaction.ADBInteraction import ADBBaseInteraction
+from ok.interaction.Win32Interaction import Win32Interaction
+from ok.logging.Logger import get_logger
 
 logger = get_logger(__name__)
 
@@ -102,7 +102,6 @@ class DeviceManager:
             self.device_dict[self.hwnd_title] = {"address": "", "imei": self.hwnd_title, "method": "windows",
                                                  "model": "", "nick": nick or self.hwnd_title,
                                                  "connected": self.hwnd is not None and self.hwnd.exists,
-                                                 "preferred": False,
                                                  "resolution": f"{width}x{height}"}
         communicate.adb_devices.emit()
         self.config.save_file()
@@ -110,20 +109,13 @@ class DeviceManager:
 
     def set_preferred_device(self, imei=None):
         logger.debug(f"set_preferred_device {imei}")
-        preferred = None
         if imei is None:
-            for device in self.device_dict.values():
-                if device.get('preferred'):
-                    preferred = device
-                    imei = preferred['imei']
-        else:
-            preferred = self.device_dict.get(imei)
-        for key in self.device_dict.keys():
-            if imei == key:
-                self.device_dict[imei]["preferred"] = False
+            imei = self.config.get("preferred")
+        preferred = self.device_dict.get(imei)
         if preferred is None and len(self.device_dict) > 0:
             preferred = next(iter(self.device_dict.values()))
         if preferred is not None:
+            imei = preferred['imei']
             preferred['preferred'] = True
             if preferred['method'] == 'windows':
                 if not isinstance(self.capture_method, WindowsGraphicsCaptureMethod):
@@ -141,6 +133,7 @@ class DeviceManager:
                         self.capture_method.close()
                     self.capture_method = ADBCaptureMethod(self)
                     self.interaction = ADBBaseInteraction(self, self.capture_method)
+        self.config["preferred"] = imei
         self.config.save_file()
         logger.debug(f'preferred device: {preferred}')
 
@@ -148,10 +141,10 @@ class DeviceManager:
         if isinstance(self.capture_method, ADBCaptureMethod):
             if self.debug:
                 if self.hwnd is not None:
-                    self.hwnd.update_title_re("autohelper_debug")
+                    self.hwnd.update_title_re("ok_debug")
                     self.hwnd.update_frame_size(self.capture_method.width, self.capture_method.height)
                 else:
-                    self.hwnd = HwndWindow("autohelper_debug", self.exit_event, self.capture_method.width,
+                    self.hwnd = HwndWindow("ok_debug", self.exit_event, self.capture_method.width,
                                            self.capture_method.height)
             else:
                 self.hwnd.stop()
@@ -159,8 +152,6 @@ class DeviceManager:
 
     @property
     def device(self):
-        if self._device is None:
-            self.set_preferred_device()
         return self._device
 
     @property

{ok-script-0.0.7/autohelper → ok-script-0.0.9/ok}/capture/adb/vbox.py

@@ -6,9 +6,9 @@ from dataclasses import dataclass
 import adbutils
 import win32com.client
 
-from autohelper.capture.adb.targets import ADBControllerTarget
-from autohelper.logging.Logger import get_logger
-from autohelper.util import win32_process
+from ok.capture.adb.targets import ADBControllerTarget
+from ok.logging.Logger import get_logger
+from ok.util import win32_process
 
 logger = get_logger(__name__)
 

{ok-script-0.0.7/autohelper → ok-script-0.0.9/ok}/capture/windows/WindowsGraphicsCaptureMethod.py

@@ -6,20 +6,20 @@ import time
 import numpy as np
 from typing_extensions import override
 
-from autohelper.capture.BaseCaptureMethod import BaseCaptureMethod
-from autohelper.capture.HwndWindow import HwndWindow
-from autohelper.capture.windows import d3d11
-from autohelper.capture.windows.utils import WINDOWS_BUILD_NUMBER
-from autohelper.logging.Logger import get_logger
-from autohelper.rotypes import IInspectable
-from autohelper.rotypes.Windows.Foundation import TypedEventHandler
-from autohelper.rotypes.Windows.Graphics.Capture import Direct3D11CaptureFramePool, IGraphicsCaptureItemInterop, \
+from ok.capture.BaseCaptureMethod import BaseCaptureMethod
+from ok.capture.HwndWindow import HwndWindow
+from ok.capture.windows import d3d11
+from ok.capture.windows.utils import WINDOWS_BUILD_NUMBER
+from ok.logging.Logger import get_logger
+from ok.rotypes import IInspectable
+from ok.rotypes.Windows.Foundation import TypedEventHandler
+from ok.rotypes.Windows.Graphics.Capture import Direct3D11CaptureFramePool, IGraphicsCaptureItemInterop, \
     IGraphicsCaptureItem, GraphicsCaptureItem
-from autohelper.rotypes.Windows.Graphics.DirectX import DirectXPixelFormat
-from autohelper.rotypes.Windows.Graphics.DirectX.Direct3D11 import IDirect3DDevice, \
+from ok.rotypes.Windows.Graphics.DirectX import DirectXPixelFormat
+from ok.rotypes.Windows.Graphics.DirectX.Direct3D11 import IDirect3DDevice, \
     CreateDirect3D11DeviceFromDXGIDevice, \
     IDirect3DDxgiInterfaceAccess
-from autohelper.rotypes.roapi import GetActivationFactory
+from ok.rotypes.roapi import GetActivationFactory
 
 PBYTE = ctypes.POINTER(ctypes.c_ubyte)
 WGC_NO_BORDER_MIN_BUILD = 20348

{ok-script-0.0.7/autohelper → ok-script-0.0.9/ok}/capture/windows/d3d11.py

@@ -1,7 +1,7 @@
 import ctypes.wintypes
 
-from autohelper.rotypes import IUnknown
-from autohelper.rotypes import idldsl
+from ok.rotypes import IUnknown
+from ok.rotypes import idldsl
 
 D3D11_SDK_VERSION = 7
 D3D_DRIVER_TYPE_HARDWARE = 1

{ok-script-0.0.7/autohelper → ok-script-0.0.9/ok}/config/Config.py

@@ -1,5 +1,5 @@
-from autohelper.util.json import read_json_file, write_json_file
-from autohelper.util.path import get_path_relative_to_exe
+from ok.util.json import read_json_file, write_json_file
+from ok.util.path import get_path_relative_to_exe
 
 
 class Config:

{ok-script-0.0.7/autohelper → ok-script-0.0.9/ok}/config/InfoDict.py

@@ -1,4 +1,4 @@
-from autohelper.gui.Communicate import communicate
+from ok.gui.Communicate import communicate
 
 
 class InfoDict(dict):

{ok-script-0.0.7/autohelper → ok-script-0.0.9/ok}/feature/Box.py

@@ -24,6 +24,14 @@ class Box:
                 self.confidence == other.confidence and
                 self.name == other.name)
 
+    def in_boundary(self, boxes):
+        in_boundary_boxes = []
+        for box in boxes:
+            if (self.x <= box.x and self.x + self.width >= box.x + box.width and
+                    self.y <= box.y and self.y + self.height >= box.y + box.height):
+                in_boundary_boxes.append(box)
+        return in_boundary_boxes
+
     def __repr__(self):
         return self.name
 
@@ -80,7 +88,7 @@ class Box:
     def center(self):
         return self.x + self.width / 2, self.y + self.height / 2
 
-    def find_closest_box(self, direction: str, boxes: list):
+    def find_closest_box(self, direction: str, boxes: list, condition=None):
         orig_center_x, orig_center_y = self.center()
 
         def distance_criteria(box):
@@ -91,14 +99,21 @@ class Box:
             dy = box_center_y - orig_center_y
             distance = math.sqrt(dx ** 2 + dy ** 2)
             if box == self:
-                return float('inf')
+                distance = float('inf')
             elif direction == 'up' and self.y - (box.y + box.height / 2) >= 0:
-                return distance
+                pass
             elif direction == 'down' and box.y - (self.y + self.height / 2) >= 0:
-                return distance
+                pass
             elif direction == 'left' and self.x - (box.x + box.width / 2) >= 0:
-                return distance
+                pass
             elif direction == 'right' and box.x - (self.x + self.width / 2) >= 0:
+                pass
+            else:
+                distance = float('inf')
+            return check_condition(box, distance)
+
+        def check_condition(box, distance):
+            if condition is None or condition(box):
                 return distance
             else:
                 return float('inf')

{ok-script-0.0.7/autohelper → ok-script-0.0.9/ok}/feature/FeatureSet.py

@@ -7,10 +7,10 @@ from typing import List
 import cv2
 import numpy as np
 
-from autohelper.feature.Box import Box, sort_boxes
-from autohelper.feature.Feature import Feature
-from autohelper.gui.Communicate import communicate
-from autohelper.logging.Logger import get_logger
+from ok.feature.Box import Box, sort_boxes
+from ok.feature.Feature import Feature
+from ok.gui.Communicate import communicate
+from ok.logging.Logger import get_logger
 
 logger = get_logger(__name__)
 

{ok-script-0.0.7/autohelper → ok-script-0.0.9/ok}/feature/FindFeature.py

@@ -1,7 +1,7 @@
 import sys
 from typing import List
 
-from autohelper.feature.Box import Box
+from ok.feature.Box import Box
 
 
 class FindFeature:

{ok-script-0.0.7/autohelper → ok-script-0.0.9/ok}/gui/App.py

@@ -5,25 +5,26 @@ from PySide6.QtCore import QSize, QCoreApplication, QLocale, QTranslator
 from PySide6.QtGui import QIcon
 from PySide6.QtWidgets import QApplication, QStyleFactory, QMenu, QSystemTrayIcon
 
-import autohelper
-import autohelper.gui.resources
-from autohelper.gui.Communicate import communicate
-from autohelper.gui.MainWindow import MainWindow
-from autohelper.gui.i18n.path import i18n_path
-from autohelper.gui.loading.LoadingWindow import LoadingWindow
-from autohelper.gui.overlay.OverlayWindow import OverlayWindow
-from autohelper.logging.Logger import get_logger
+import ok
+import ok.gui.resources
+from ok.gui.Communicate import communicate
+from ok.gui.MainWindow import MainWindow
+from ok.gui.i18n.path import i18n_path
+from ok.gui.loading.LoadingWindow import LoadingWindow
+from ok.gui.overlay.OverlayWindow import OverlayWindow
+from ok.logging.Logger import get_logger
 
 logger = get_logger(__name__)
 
 
 class App:
-    def __init__(self, icon=None, overlay=False, title="AutoUI", tasks=None,
+    def __init__(self, icon=None, overlay=False, title="AutoUI", tasks=None, about=None,
                  exit_event=None):
         super().__init__()
         self.app = QApplication(sys.argv)
         self.app.setStyle(QStyleFactory.create("Fusion"))
         self.tasks = tasks
+        self.about = about
         self.title = title
         self.overlay = overlay
         self.loading_window = None
@@ -86,11 +87,11 @@ class App:
 
     def show_main_window(self):
         self.loading_window.close()
-        self.main_window = MainWindow(self.tasks, self.overlay, exit_event=self.exit_event)
+        self.main_window = MainWindow(self.tasks, self.overlay, self.about, exit_event=self.exit_event)
         self.main_window.setWindowTitle(self.title)  # Set the window title here
         self.main_window.setWindowIcon(self.icon)
-        if self.overlay and autohelper.gui.device_manager.hwnd is not None:
-            self.overlay_window = OverlayWindow(autohelper.gui.device_manager.hwnd)
+        if self.overlay and ok.gui.device_manager.hwnd is not None:
+            self.overlay_window = OverlayWindow(ok.gui.device_manager.hwnd)
 
         size = self.size_relative_to_screen(width=0.5, height=0.6)
         self.main_window.resize(size)

{ok-script-0.0.7/autohelper → ok-script-0.0.9/ok}/gui/MainWindow.py

@@ -1,9 +1,10 @@
 from PySide6.QtCore import QObject, Signal, Slot
 from PySide6.QtWidgets import QMessageBox, QTabWidget
 
-from autohelper.gui.debug.DebugTab import DebugTab
-from autohelper.gui.tasks.TaskTab import TaskTab
-from autohelper.logging.Logger import get_logger
+from ok.gui.about.AboutTab import AboutTab
+from ok.gui.debug.DebugTab import DebugTab
+from ok.gui.tasks.TaskTab import TaskTab
+from ok.logging.Logger import get_logger
 
 logger = get_logger(__name__)
 
@@ -13,7 +14,7 @@ class Communicate(QObject):
 
 
 class MainWindow(QTabWidget):
-    def __init__(self, tasks, debug=False, exit_event=None):
+    def __init__(self, tasks, debug=False, about=None, exit_event=None):
         super().__init__()
         self.exit_event = exit_event
         task_tab = TaskTab(tasks)
@@ -22,6 +23,9 @@ class MainWindow(QTabWidget):
             debug_tab = DebugTab()
             self.addTab(debug_tab, self.tr("Debug"))
         # ... Add other tabs similarly
+        if about:
+            about_tab = AboutTab(about)
+            self.addTab(about_tab, self.tr("About"))
 
         # Styling the tabs and content if needed, for example:
         self.setStyleSheet("""

{ok-script-0.0.7/autohelper → ok-script-0.0.9/ok}/gui/__init__.py

@@ -1,4 +1,4 @@
-from autohelper.capture.adb.DeviceManager import DeviceManager
+from ok.capture.adb.DeviceManager import DeviceManager
 
 executor = None
 app = None

ok-script-0.0.9/ok/gui/about/AboutTab.py

@@ -0,0 +1,16 @@
+from PySide6.QtWidgets import QWidget, QTextEdit, QVBoxLayout
+
+
+class AboutTab(QWidget):
+    def __init__(self, text=""):
+        super().__init__()
+        layout = QVBoxLayout()
+
+        # Create a QTextEdit instance
+        text_edit = QTextEdit()
+        text_edit.setHtml(text)
+        text_edit.setReadOnly(True)
+        layout.addWidget(text_edit)
+
+        # Set the layout on the widget
+        self.setLayout(layout)

{ok-script-0.0.7/autohelper → ok-script-0.0.9/ok}/gui/debug/DebugTab.py

@@ -1,9 +1,9 @@
 from PySide6.QtCore import Qt
 from PySide6.QtWidgets import QWidget, QGridLayout, QSplitter
 
-from autohelper.gui.debug.FrameWidget import FrameWidget
-from autohelper.gui.debug.InfoWidget import InfoWidget
-from autohelper.gui.debug.LoggerWidget import LoggerWidget
+from ok.gui.debug.FrameWidget import FrameWidget
+from ok.gui.debug.InfoWidget import InfoWidget
+from ok.gui.debug.LoggerWidget import LoggerWidget
 
 
 class DebugTab(QWidget):

{ok-script-0.0.7/autohelper → ok-script-0.0.9/ok}/gui/debug/FrameWidget.py

@@ -5,8 +5,8 @@ from PySide6.QtCore import Qt
 from PySide6.QtGui import QPainter, QImage, QPixmap, QColor, QPen
 from PySide6.QtWidgets import QWidget
 
-from autohelper.feature.Box import Box
-from autohelper.gui.Communicate import communicate
+from ok.feature.Box import Box
+from ok.gui.Communicate import communicate
 
 
 class FrameWidget(QWidget):

{ok-script-0.0.7/autohelper → ok-script-0.0.9/ok}/gui/debug/InfoWidget.py

@@ -1,6 +1,6 @@
 from PySide6.QtWidgets import QWidget, QVBoxLayout, QLabel
 
-from autohelper.gui.Communicate import communicate
+from ok.gui.Communicate import communicate
 
 
 class InfoWidget(QWidget):

{ok-script-0.0.7/autohelper → ok-script-0.0.9/ok}/gui/debug/LoggerWidget.py

@@ -2,7 +2,7 @@ import logging
 
 from PySide6.QtWidgets import (QWidget, QVBoxLayout, QHBoxLayout, QComboBox, QLineEdit, QTextEdit)
 
-from autohelper.gui.Communicate import communicate
+from ok.gui.Communicate import communicate
 
 level_map = {'DEBUG': logging.DEBUG, 'INFO': logging.INFO, 'WARNING': logging.WARNING, 'ERROR': logging.ERROR,
              'CRITICAL': logging.CRITICAL}

{ok-script-0.0.7/autohelper → ok-script-0.0.9/ok}/gui/loading/LoadingWindow.py

@@ -1,12 +1,12 @@
 from PySide6.QtCore import Qt, QTimer
 from PySide6.QtWidgets import QWidget, QVBoxLayout, QMessageBox, QHBoxLayout, QListWidget, QPushButton
 
-import autohelper
-from autohelper.gui.Communicate import communicate
-from autohelper.gui.util.Alert import show_alert
-from autohelper.gui.widget.RoundCornerContainer import RoundCornerContainer
-from autohelper.interaction.Win32Interaction import is_admin
-from autohelper.logging.Logger import get_logger
+import ok
+from ok.gui.Communicate import communicate
+from ok.gui.util.Alert import show_alert
+from ok.gui.widget.RoundCornerContainer import RoundCornerContainer
+from ok.interaction.Win32Interaction import is_admin
+from ok.logging.Logger import get_logger
 
 logger = get_logger(__name__)
 
@@ -50,7 +50,7 @@ class LoadingWindow(QWidget):
         self.update_capture()
 
     def refresh_clicked(self):
-        autohelper.gui.device_manager.refresh()
+        ok.gui.device_manager.refresh()
         self.refresh_button.setDisabled(True)
         self.refresh_button.setText(self.tr("Refreshing"))
 
@@ -65,22 +65,22 @@ class LoadingWindow(QWidget):
             show_alert(self.tr("Error"),
                        self.tr(f"PC version requires admin privileges, Please restart this app with admin privileges!"))
             return
-        autohelper.gui.device_manager.start()
+        ok.gui.device_manager.start()
         self.app.show_main_window()
 
     def capture_index_changed(self):  # i is an index
         i = self.capture_list.currentRow()
         imei = self.capture_list_data[i]["imei"]
-        autohelper.gui.device_manager.set_preferred_device(imei)
+        ok.gui.device_manager.set_preferred_device(imei)
 
     def update_capture(self):
-        devices = autohelper.gui.device_manager.get_devices()
+        devices = ok.gui.device_manager.get_devices()
         selected = self.capture_list.currentRow()
         self.capture_list.clear()
         self.capture_list_data.clear()
         if len(devices) > 0:
             for row, device in enumerate(devices):
-                if device["preferred"]:
+                if device["imei"] == ok.gui.device_manager.config.get("preferred"):
                     selected = row
                 method = self.tr("PC") if device['method'] == "windows" else self.tr("Android")
                 connected = self.tr("Connected") if device['connected'] else self.tr("Disconnected")

{ok-script-0.0.7/autohelper → ok-script-0.0.9/ok}/gui/overlay/OverlayWindow.py

@@ -1,9 +1,9 @@
 from PySide6.QtCore import QObject, Signal, Qt
 
-from autohelper.capture.HwndWindow import HwndWindow
-from autohelper.gui.Communicate import communicate
-from autohelper.gui.debug.FrameWidget import FrameWidget
-from autohelper.logging.Logger import get_logger
+from ok.capture.HwndWindow import HwndWindow
+from ok.gui.Communicate import communicate
+from ok.gui.debug.FrameWidget import FrameWidget
+from ok.logging.Logger import get_logger
 
 logger = get_logger(__name__)
 

{ok-script-0.0.7/autohelper → ok-script-0.0.9/ok}/gui/tasks/ConfigItemFactory.py

@@ -1,6 +1,6 @@
-from autohelper.gui.widget.ListTableWidgetItem import ListTableWidgetItem
-from autohelper.gui.widget.NumericTableWidgetItem import NumericTableWidgetItem
-from autohelper.gui.widget.YesNonWidgetItem import YesNonWidgetItem
+from ok.gui.widget.ListTableWidgetItem import ListTableWidgetItem
+from ok.gui.widget.NumericTableWidgetItem import NumericTableWidgetItem
+from ok.gui.widget.YesNonWidgetItem import YesNonWidgetItem
 
 
 def config_widget_item(table, row, col, config, key, value):

{ok-script-0.0.7/autohelper → ok-script-0.0.9/ok}/gui/tasks/StartButton.py

@@ -2,10 +2,10 @@ from PySide6.QtCore import Slot, QPropertyAnimation
 from PySide6.QtGui import QColor
 from PySide6.QtWidgets import QPushButton
 
-import autohelper
-from autohelper.gui.Communicate import communicate
-from autohelper.gui.util.Alert import show_alert
-from autohelper.logging.Logger import get_logger
+import ok
+from ok.gui.Communicate import communicate
+from ok.gui.util.Alert import show_alert
+from ok.logging.Logger import get_logger
 
 logger = get_logger(__name__)
 
@@ -33,12 +33,12 @@ class StartButton(QPushButton):
     def toggle_text(self):
         if self.isChecked():
             logger.info("Click Start Executor")
-            if not autohelper.gui.executor.start():
+            if not ok.gui.executor.start():
                 show_alert("Error", "No Task to Run, Please Enable Task First!")
                 self.setChecked(False)
         else:
             logger.info("Click Pause Executor")
-            autohelper.gui.executor.pause()
+            ok.gui.executor.pause()
 
     def start_animation(self):
         self.animation.setStartValue(QColor(0, 0, 0))

{ok-script-0.0.7/autohelper → ok-script-0.0.9/ok}/gui/tasks/TaskOpButton.py

@@ -1,8 +1,8 @@
 from PySide6.QtCore import Slot
 from PySide6.QtWidgets import QPushButton
 
-from autohelper.logging.Logger import get_logger
-from autohelper.task.BaseTask import BaseTask
+from ok.logging.Logger import get_logger
+from ok.task.BaseTask import BaseTask
 
 logger = get_logger(__name__)