From 0a6e9e62bb4c8dddf6d6c3a3537883ef0ef8d170 Mon Sep 17 00:00:00 2001 From: JE-Chen <33644111+JE-Chen@users.noreply.github.com> Date: Tue, 4 Feb 2025 02:28:24 +0800 Subject: [PATCH] Update stable and dev version Update stable and dev version --- .../automation_editor_ui/menu/menu_utils.py | 4 ++-- .../syntax/syntax_extend.py | 20 +++++++------------ exe/test_source/1.png | 0 exe/test_source/2.png | 0 exe/test_source/3.png | 0 exe/test_source/4.png | 0 exe/test_source/5.png | 0 exe/test_source/6.png | 0 exe/test_source/7.png | 0 exe/test_source/8.png | 0 exe/test_source/9.png | 0 exe/test_source/equal.png | 0 exe/test_source/minus.png | 0 exe/test_source/plus.png | 0 exe/test_source/test.png | 0 exe/test_source/test1.PNG | 0 exe/test_source/test_template.png | 0 pyproject.toml | 8 ++++---- dev.toml => stable.toml | 8 ++++---- 19 files changed, 17 insertions(+), 23 deletions(-) delete mode 100644 exe/test_source/1.png delete mode 100644 exe/test_source/2.png delete mode 100644 exe/test_source/3.png delete mode 100644 exe/test_source/4.png delete mode 100644 exe/test_source/5.png delete mode 100644 exe/test_source/6.png delete mode 100644 exe/test_source/7.png delete mode 100644 exe/test_source/8.png delete mode 100644 exe/test_source/9.png delete mode 100644 exe/test_source/equal.png delete mode 100644 exe/test_source/minus.png delete mode 100644 exe/test_source/plus.png delete mode 100644 exe/test_source/test.png delete mode 100644 exe/test_source/test1.PNG delete mode 100644 exe/test_source/test_template.png rename dev.toml => stable.toml (91%) diff --git a/automation_ide/automation_editor_ui/menu/menu_utils.py b/automation_ide/automation_editor_ui/menu/menu_utils.py index 071433c..acad10b 100644 --- a/automation_ide/automation_editor_ui/menu/menu_utils.py +++ b/automation_ide/automation_editor_ui/menu/menu_utils.py @@ -2,7 +2,7 @@ from typing import TYPE_CHECKING -from je_editor import JEBrowser +from je_editor import BrowserWidget if TYPE_CHECKING: from automation_ide.automation_editor_ui.editor_main.main_ui import AutomationEditor @@ -11,6 +11,6 @@ def open_web_browser( automation_editor_instance: AutomationEditor, url: str, tab_name: str) -> None: automation_editor_instance.tab_widget.addTab( - JEBrowser(start_url=url), + BrowserWidget(start_url=url), f"{tab_name}{automation_editor_instance.tab_widget.count()}" ) diff --git a/automation_ide/automation_editor_ui/syntax/syntax_extend.py b/automation_ide/automation_editor_ui/syntax/syntax_extend.py index 432ecc6..aa08b39 100644 --- a/automation_ide/automation_editor_ui/syntax/syntax_extend.py +++ b/automation_ide/automation_editor_ui/syntax/syntax_extend.py @@ -6,28 +6,19 @@ if TYPE_CHECKING: from automation_ide.automation_editor_ui.editor_main.main_ui import AutomationEditor -from PySide6.QtCore import QRegularExpression -from PySide6.QtGui import QTextCharFormat, QColor +from PySide6.QtGui import QColor from automation_ide.automation_editor_ui.syntax.syntax_keyword import \ package_keyword_list from automation_ide.utils.manager.package_manager.package_manager_class import package_manager -from je_editor import syntax_word_setting_dict +from je_editor import syntax_extend_setting_dict def syntax_extend_package(main_window: AutomationEditor) -> None: - widget = main_window.tab_widget.currentWidget() - if isinstance(widget, EditorWidget): - for package in package_manager.syntax_check_list: - text_char_format = QTextCharFormat() - text_char_format.setForeground(QColor(255, 255, 0)) - for word in package_keyword_list.get(package): - # Highlight - pattern = QRegularExpression(rf"\b{word}\b") - widget.code_edit.highlighter.highlight_rules.append((pattern, text_char_format)) + syntax_extend_setting_dict.update({".json": {}}) for package in package_manager.syntax_check_list: - syntax_word_setting_dict.update( + syntax_extend_setting_dict.get(".json").update( { package: { "words": set(package_keyword_list.get(package)), @@ -35,3 +26,6 @@ def syntax_extend_package(main_window: AutomationEditor) -> None: } } ) + widget = main_window.tab_widget.currentWidget() + if isinstance(widget, EditorWidget): + widget.code_edit.reset_highlighter() diff --git a/exe/test_source/1.png b/exe/test_source/1.png deleted file mode 100644 index e69de29..0000000 diff --git a/exe/test_source/2.png b/exe/test_source/2.png deleted file mode 100644 index e69de29..0000000 diff --git a/exe/test_source/3.png b/exe/test_source/3.png deleted file mode 100644 index e69de29..0000000 diff --git a/exe/test_source/4.png b/exe/test_source/4.png deleted file mode 100644 index e69de29..0000000 diff --git a/exe/test_source/5.png b/exe/test_source/5.png deleted file mode 100644 index e69de29..0000000 diff --git a/exe/test_source/6.png b/exe/test_source/6.png deleted file mode 100644 index e69de29..0000000 diff --git a/exe/test_source/7.png b/exe/test_source/7.png deleted file mode 100644 index e69de29..0000000 diff --git a/exe/test_source/8.png b/exe/test_source/8.png deleted file mode 100644 index e69de29..0000000 diff --git a/exe/test_source/9.png b/exe/test_source/9.png deleted file mode 100644 index e69de29..0000000 diff --git a/exe/test_source/equal.png b/exe/test_source/equal.png deleted file mode 100644 index e69de29..0000000 diff --git a/exe/test_source/minus.png b/exe/test_source/minus.png deleted file mode 100644 index e69de29..0000000 diff --git a/exe/test_source/plus.png b/exe/test_source/plus.png deleted file mode 100644 index e69de29..0000000 diff --git a/exe/test_source/test.png b/exe/test_source/test.png deleted file mode 100644 index e69de29..0000000 diff --git a/exe/test_source/test1.PNG b/exe/test_source/test1.PNG deleted file mode 100644 index e69de29..0000000 diff --git a/exe/test_source/test_template.png b/exe/test_source/test_template.png deleted file mode 100644 index e69de29..0000000 diff --git a/pyproject.toml b/pyproject.toml index bf4ef78..e3acd05 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,12 +1,12 @@ -# Rename to build stable version -# This is stable version +# Rename to dev version +# This is dev version [build-system] requires = ["setuptools>=61.0"] build-backend = "setuptools.build_meta" [project] -name = "automation_ide" -version = "0.0.35" +name = "automation_ide_dev" +version = "0.0.42" authors = [ { name = "JE-Chen", email = "jechenmailman@gmail.com" }, ] diff --git a/dev.toml b/stable.toml similarity index 91% rename from dev.toml rename to stable.toml index 2022da4..e98a8ea 100644 --- a/dev.toml +++ b/stable.toml @@ -1,12 +1,12 @@ -# Rename to dev version -# This is dev version +# Rename to build stable version +# This is stable version [build-system] requires = ["setuptools>=61.0"] build-backend = "setuptools.build_meta" [project] -name = "automation_ide_dev" -version = "0.0.35" +name = "automation_ide" +version = "0.0.38" authors = [ { name = "JE-Chen", email = "jechenmailman@gmail.com" }, ]