ok-script 1.0.152__tar.gz → 1.0.154__tar.gz

{ok_script-1.0.152 → ok_script-1.0.154}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ok-script
-Version: 1.0.152
+Version: 1.0.154
 Summary: Automation with Computer Vision for Python
 Home-page: https://github.com/ok-oldking/ok-script
 Author: ok-oldking
@@ -13,7 +13,7 @@ Requires-Python: ==3.12.*
 Description-Content-Type: text/markdown
 Requires-Dist: pywin32>=306
 Requires-Dist: pyappify>=1.0.3
-Requires-Dist: PySide6-Fluent-Widgets==1.8.3
+Requires-Dist: PySide6-Fluent-Widgets>=1.8.3
 Requires-Dist: typing-extensions>=4.11.0
 Requires-Dist: requests>=2.32.3
 Requires-Dist: psutil>=6.0.0

{ok_script-1.0.152 → ok_script-1.0.154}/ok/gui/MainWindow.py

@@ -102,9 +102,9 @@ class MainWindow(FluentWindow):
                 else:
                     before_custom_tabs.append(tab_obj)
 
-        # Add custom tabs that should appear before built-in task tabs
-        for tab_obj in before_custom_tabs:
-            self.addSubInterface(tab_obj, tab_obj.icon, tab_obj.name, position=tab_obj.position)
+        # Add custom tabs that should appear before built-in task tabs
+        for tab_obj in before_custom_tabs:
+            self.addSubInterface(tab_obj, tab_obj.icon, self.app.tr(tab_obj.name), position=tab_obj.position)
 
         from ok import og
         self.imported_tabs = {}  # {file_name: tab_object}
@@ -148,9 +148,9 @@ class MainWindow(FluentWindow):
                 self.addSubInterface(group_tab, group_icon, self.app.tr(group_name))
                 self.grouped_task_tabs.append(group_tab)
 
-        # Add custom tabs that should appear after built-in task tabs
-        for tab_obj in after_custom_tabs:
-            self.addSubInterface(tab_obj, tab_obj.icon, tab_obj.name, position=tab_obj.position)
+        # Add custom tabs that should appear after built-in task tabs
+        for tab_obj in after_custom_tabs:
+            self.addSubInterface(tab_obj, tab_obj.icon, self.app.tr(tab_obj.name), position=tab_obj.position)
         if debug:
             from ok.gui.debug.DebugTab import DebugTab
             debug_tab = DebugTab(config, exit_event)

{ok_script-1.0.152 → ok_script-1.0.154}/ok/gui/tasks/EditTaskTab.py

@@ -1,64 +1,21 @@
 import os
 
-from PySide6.QtCore import QFileSystemWatcher, QUrl
-from PySide6.QtCore import Qt, QSize, QRect
-from PySide6.QtGui import QSyntaxHighlighter, QTextCharFormat, QFont, QColor, QPainter, QDesktopServices
-from PySide6.QtWidgets import QWidget, QHBoxLayout, QVBoxLayout, QMessageBox, QTreeWidgetItem, QFileDialog
-from qfluentwidgets import MessageBox, PlainTextEdit, PushButton, FluentIcon, PrimaryPushButton, SearchLineEdit, \
-    BodyLabel, ComboBox, RoundMenu, Action, TreeWidget, TransparentDropDownPushButton, CheckBox
-
-from ok import og
-from ok.gui.tasks.TemplateFactory import TemplateFactory, get_templates, filter_templates
-from ok.util.logger import Logger
-
-logger = Logger.get_logger(__name__)
-
-
-class PythonHighlighter(QSyntaxHighlighter):
-    def __init__(self, document):
-        super().__init__(document)
-        self.highlightingRules = []
-
-        keywordFormat = QTextCharFormat()
-        keywordFormat.setForeground(QColor("#569CD6")) # Visual Studio Code dark blue
-        keywordFormat.setFontWeight(QFont.Bold)
-        keywords = ["and", "as", "assert", "break", "class", "continue", "def",
-                    "del", "elif", "else", "except", "False", "finally", "for",
-                    "from", "global", "if", "import", "in", "is", "lambda", "None",
-                    "nonlocal", "not", "or", "pass", "raise", "return", "True",
-                    "try", "while", "with", "yield"]
-        for word in keywords:
-            pattern = f"\\b{word}\\b"
-            self.highlightingRules.append((pattern, keywordFormat))
-
-        classFormat = QTextCharFormat()
-        classFormat.setForeground(QColor("#4EC9B0"))
-        classFormat.setFontWeight(QFont.Bold)
-        self.highlightingRules.append(("\\b[A-Za-z0-9_]+(?=\\()", classFormat))
-        
-        selfFormat = QTextCharFormat()
-        selfFormat.setForeground(QColor("#A074C4")) # Dark purpleish color
-        selfFormat.setFontItalic(True)
-        self.highlightingRules.append(("\\bself\\b", selfFormat))
-        
-        stringFormat = QTextCharFormat()
-        stringFormat.setForeground(QColor("#D69D85"))
-        self.highlightingRules.append(("\"[^\"]*\"", stringFormat))
-        self.highlightingRules.append(("'[^']*'", stringFormat))
-
-        commentFormat = QTextCharFormat()
-        commentFormat.setForeground(QColor("#57A64A"))
-        self.highlightingRules.append(("#[^\n]*", commentFormat))
-
-        import re
-        self.compiledRules = [(re.compile(pattern), fmt) for pattern, fmt in self.highlightingRules]
-
-    def highlightBlock(self, text):
-        for pattern, format in self.compiledRules:
-            for match in pattern.finditer(text):
-                self.setFormat(match.start(), match.end() - match.start(), format)
-
-class LineNumberArea(QWidget):
+from PySide6.QtCore import QFileSystemWatcher, QUrl
+from PySide6.QtCore import Qt, QSize, QRect
+from PySide6.QtGui import QFont, QColor, QPainter, QDesktopServices
+from PySide6.QtWidgets import QWidget, QHBoxLayout, QVBoxLayout, QMessageBox, QTreeWidgetItem, QFileDialog
+from qfluentwidgets import MessageBox, PlainTextEdit, PushButton, FluentIcon, PrimaryPushButton, SearchLineEdit, \
+    BodyLabel, ComboBox, RoundMenu, Action, TreeWidget, TransparentDropDownPushButton, CheckBox
+
+from ok import og
+from ok.gui.tasks.PythonHighlighter import PythonHighlighter
+from ok.gui.tasks.TemplateFactory import TemplateFactory, get_templates, filter_templates
+from ok.util.logger import Logger
+
+logger = Logger.get_logger(__name__)
+
+
+class LineNumberArea(QWidget):
     def __init__(self, editor):
         super().__init__(editor)
         self.code_editor = editor

ok_script-1.0.154/ok/gui/tasks/PythonHighlighter.py

@@ -0,0 +1,49 @@
+import re
+
+from PySide6.QtGui import QColor, QFont, QSyntaxHighlighter, QTextCharFormat
+
+
+class PythonHighlighter(QSyntaxHighlighter):
+    """Simple Python syntax highlighter for QTextDocument-based editors."""
+
+    def __init__(self, document):
+        super().__init__(document)
+        self.highlightingRules = []
+
+        keywordFormat = QTextCharFormat()
+        keywordFormat.setForeground(QColor("#569CD6"))
+        keywordFormat.setFontWeight(QFont.Bold)
+        keywords = ["and", "as", "assert", "break", "class", "continue", "def",
+                    "del", "elif", "else", "except", "False", "finally", "for",
+                    "from", "global", "if", "import", "in", "is", "lambda", "None",
+                    "nonlocal", "not", "or", "pass", "raise", "return", "True",
+                    "try", "while", "with", "yield"]
+        for word in keywords:
+            pattern = f"\\b{word}\\b"
+            self.highlightingRules.append((pattern, keywordFormat))
+
+        functionFormat = QTextCharFormat()
+        functionFormat.setForeground(QColor("#4EC9B0"))
+        functionFormat.setFontWeight(QFont.Bold)
+        self.highlightingRules.append(("\\b[A-Za-z0-9_]+(?=\\()", functionFormat))
+
+        selfFormat = QTextCharFormat()
+        selfFormat.setForeground(QColor("#A074C4"))
+        selfFormat.setFontItalic(True)
+        self.highlightingRules.append(("\\bself\\b", selfFormat))
+
+        stringFormat = QTextCharFormat()
+        stringFormat.setForeground(QColor("#D69D85"))
+        self.highlightingRules.append(("\"[^\"]*\"", stringFormat))
+        self.highlightingRules.append(("'[^']*'", stringFormat))
+
+        commentFormat = QTextCharFormat()
+        commentFormat.setForeground(QColor("#57A64A"))
+        self.highlightingRules.append(("#[^\n]*", commentFormat))
+
+        self.compiledRules = [(re.compile(pattern), fmt) for pattern, fmt in self.highlightingRules]
+
+    def highlightBlock(self, text):
+        for pattern, text_format in self.compiledRules:
+            for match in pattern.finditer(text):
+                self.setFormat(match.start(), match.end() - match.start(), text_format)

{ok_script-1.0.152 → ok_script-1.0.154}/ok/gui/widget/CustomTab.py

@@ -11,12 +11,18 @@ class CustomTab(Tab):
         self.logger = Logger.get_logger(self.__class__.__name__)
         self.executor: TaskExecutor | None = None
 
-    def get_task(self, cls):
-        return self.executor.get_task_by_class(cls)
-
-    @property
-    def name(self):
-        return "CustomTab"
+    def get_task(self, cls):
+        return self.executor.get_task_by_class(cls)
+
+    def tr(self, message):
+        from ok import og
+        if og.app:
+            return og.app.tr(message)
+        return super().tr(message)
+
+    @property
+    def name(self):
+        return "CustomTab"
 
     @property
     def position(self):

{ok_script-1.0.152 → ok_script-1.0.154}/ok_script.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ok-script
-Version: 1.0.152
+Version: 1.0.154
 Summary: Automation with Computer Vision for Python
 Home-page: https://github.com/ok-oldking/ok-script
 Author: ok-oldking
@@ -13,7 +13,7 @@ Requires-Python: ==3.12.*
 Description-Content-Type: text/markdown
 Requires-Dist: pywin32>=306
 Requires-Dist: pyappify>=1.0.3
-Requires-Dist: PySide6-Fluent-Widgets==1.8.3
+Requires-Dist: PySide6-Fluent-Widgets>=1.8.3
 Requires-Dist: typing-extensions>=4.11.0
 Requires-Dist: requests>=2.32.3
 Requires-Dist: psutil>=6.0.0

{ok_script-1.0.152 → ok_script-1.0.154}/ok_script.egg-info/SOURCES.txt

@@ -143,6 +143,7 @@ ok/gui/tasks/MarkUpWindow.py
 ok/gui/tasks/ModifyListDialog.py
 ok/gui/tasks/ModifyListItem.py
 ok/gui/tasks/OneTimeTaskTab.py
+ok/gui/tasks/PythonHighlighter.py
 ok/gui/tasks/RecordScript.py
 ok/gui/tasks/ScheduleTaskTab.py
 ok/gui/tasks/ScriptPackager.py

{ok_script-1.0.152 → ok_script-1.0.154}/ok_script.egg-info/requires.txt

@@ -1,6 +1,6 @@
 pywin32>=306
 pyappify>=1.0.3
-PySide6-Fluent-Widgets==1.8.3
+PySide6-Fluent-Widgets>=1.8.3
 typing-extensions>=4.11.0
 requests>=2.32.3
 psutil>=6.0.0

{ok_script-1.0.152 → ok_script-1.0.154}/setup.py

@@ -35,7 +35,7 @@ setuptools.setup(
     install_requires=[
         'pywin32>=306',
         'pyappify>=1.0.3',
-        'PySide6-Fluent-Widgets==1.8.3',
+        'PySide6-Fluent-Widgets>=1.8.3',
         'typing-extensions>=4.11.0',
         'requests>=2.32.3',
         'psutil>=6.0.0',