Merge pull request #64 from Integration-Automation/dev

Now FrontEngine extendable

.github/workflows/front_engine_dev_python3_10.yml

@@ -27,3 +27,5 @@ jobs:
         pip install -r dev_requirements.txt
     - name: Start FrontEngine
       run: python ./tests/unit_test/start/start_front_engine.py
+    - name: Extend FrontEngine
+      run: python ./tests/unit_test/start/extend_front_engine.py

.github/workflows/front_engine_dev_python3_11.yml

@@ -27,3 +27,5 @@ jobs:
         pip install -r dev_requirements.txt
     - name: Start FrontEngine
       run: python ./tests/unit_test/start/start_front_engine.py
+    - name: Extend FrontEngine
+      run: python ./tests/unit_test/start/extend_front_engine.py

.github/workflows/front_engine_dev_python3_8.yml

@@ -27,3 +27,5 @@ jobs:
         pip install -r dev_requirements.txt
     - name: Start FrontEngine
       run: python ./tests/unit_test/start/start_front_engine.py
+    - name: Extend FrontEngine
+      run: python ./tests/unit_test/start/extend_front_engine.py

.github/workflows/front_engine_dev_python3_9.yml

@@ -27,3 +27,5 @@ jobs:
         pip install -r dev_requirements.txt
     - name: Start FrontEngine
       run: python ./tests/unit_test/start/start_front_engine.py
+    - name: Extend FrontEngine
+      run: python ./tests/unit_test/start/extend_front_engine.py

.github/workflows/front_engine_stable_python3_10.yml

@@ -26,4 +26,6 @@ jobs:
         python -m pip install --upgrade pip wheel
         pip install -r requirements.txt
     - name: Start FrontEngine
-      run: python ./tests/unit_test/start/start_front_engine.py
+      run: python ./tests/unit_test/start/start_front_engine.py
+    - name: Extend FrontEngine
+      run: python ./tests/unit_test/start/extend_front_engine.py

.github/workflows/front_engine_stable_python3_11.yml

@@ -26,4 +26,6 @@ jobs:
         python -m pip install --upgrade pip wheel
         pip install -r requirements.txt
     - name: Start FrontEngine
-      run: python ./tests/unit_test/start/start_front_engine.py
+      run: python ./tests/unit_test/start/start_front_engine.py
+    - name: Extend FrontEngine
+      run: python ./tests/unit_test/start/extend_front_engine.py

.github/workflows/front_engine_stable_python3_8.yml

@@ -26,4 +26,6 @@ jobs:
         python -m pip install --upgrade pip wheel
         pip install -r requirements.txt
     - name: Start FrontEngine
-      run: python ./tests/unit_test/start/start_front_engine.py
+      run: python ./tests/unit_test/start/start_front_engine.py
+    - name: Extend FrontEngine
+      run: python ./tests/unit_test/start/extend_front_engine.py

.github/workflows/front_engine_stable_python3_9.yml

@@ -26,4 +26,6 @@ jobs:
         python -m pip install --upgrade pip wheel
         pip install -r requirements.txt
     - name: Start FrontEngine
-      run: python ./tests/unit_test/start/start_front_engine.py
+      run: python ./tests/unit_test/start/start_front_engine.py
+    - name: Extend FrontEngine
+      run: python ./tests/unit_test/start/extend_front_engine.py

dev.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "frontengine_dev"
-version = "0.0.39"
+version = "0.0.40"
 authors = [
     { name = "JE-Chen", email = "[email protected]" },
 ]

frontengine/__init__.py

@@ -20,11 +20,12 @@
 from frontengine.ui.main.main_ui import FrontEngineMainUI
 from frontengine.ui.setting.scene_setting.scene_setting_ui import SceneControlSettingUI
 from frontengine.ui.setting.chat_scene.chat_scene_setting import ChatSceneUI
+from frontengine.ui.main.main_ui import EDITOR_EXTEND_TAB
 
 __all__ = [
     "start_front_engine", "GifWidget", "SoundPlayer", "SoundEffectWidget", "TextWidget",
     "WebWidget", "ImageWidget", "VideoWidget", "language_wrapper", "load_extend_ui_file", "load_ui_file",
     "TextSettingUI", "WEBSettingUI", "GIFSettingUI", "ImageSettingUI", "SoundPlayerSettingUI",
     "VideoSettingUI", "ControlCenterUI", "SceneSettingUI", "FrontEngineMainUI", "SceneControlSettingUI",
-    "ChatSceneUI"
+    "ChatSceneUI", "EDITOR_EXTEND_TAB"
 ]

frontengine/ui/chat/chat_scene_input.py

@@ -63,6 +63,6 @@ def check_error(self):
             gpt_error_messagebox.show()
 
     def close(self) -> bool:
-        self.deleteLater()
         self.get_message_timer.stop()
+        self.check_error_timer.stop()
         return super().close()

frontengine/ui/main/main_ui.py

@@ -1,10 +1,11 @@
 import os
 import sys
 from pathlib import Path
+from typing import Dict, Type
 
 from PySide6.QtCore import QTimer
 from PySide6.QtGui import QIcon, QAction
-from PySide6.QtWidgets import QMainWindow, QApplication, QGridLayout, QTabWidget, QMenuBar
+from PySide6.QtWidgets import QMainWindow, QApplication, QGridLayout, QTabWidget, QMenuBar, QWidget
 from qt_material import apply_stylesheet, QtStyleTools
 
 from frontengine.ui.main.language_menu import build_language_menu
@@ -21,6 +22,8 @@
 from frontengine.user_setting.user_setting_file import write_user_setting, read_user_setting, user_setting_dict
 from frontengine.utils.multi_language.language_wrapper import language_wrapper
 
+EDITOR_EXTEND_TAB: Dict[str, Type[QWidget]] = {}
+
 
 class FrontEngineMainUI(QMainWindow, QtStyleTools):
 
@@ -93,6 +96,8 @@ def __init__(self, debug: bool = False):
             self.control_center_ui,
             language_wrapper.language_word_dict.get("tab_control_center_text")
         )
+        for widget_name, widget in EDITOR_EXTEND_TAB.items():
+            self.tab_widget.addTab(widget(), widget_name)
         self.setCentralWidget(self.tab_widget)
         # Set Icon
         self.icon_path = Path(os.getcwd() + "/je_driver_icon.ico")
@@ -103,6 +108,7 @@ def __init__(self, debug: bool = False):
                 self.system_tray = ExtendSystemTray(main_window=self)
                 self.system_tray.setIcon(self.icon)
                 self.system_tray.show()
+                self.system_tray.setToolTip("FrontEngine")
         if debug:
             self.debug_timer = QTimer()
             self.debug_timer.setInterval(10000)

frontengine/ui/main/system_tray/extend_system_tray.py

@@ -29,8 +29,13 @@ def __init__(self, main_window: FrontEngineMainUI):
         self.close_main_window_action.triggered.connect(self.close_all)
         self.menu.addAction(self.close_main_window_action)
         self.setContextMenu(self.menu)
+        self.activated.connect(self.clicked)
 
     def close_all(self):
         self.setVisible(False)
         self.main_window.close()
         sys.exit(0)
+
+    def clicked(self, reason):
+        if reason == self.ActivationReason.DoubleClick:
+            self.main_window.showMaximized()

frontengine/ui/setting/chat_scene/chat_scene_setting.py

@@ -150,6 +150,7 @@ def new_topic(self):
 
     def close_chat_ui(self):
         self.chat_input.close()
+        self.chat_input = None
         self.chat_list.clear()
         self.close_scene()
 

frontengine/ui/setting/text/text_setting_ui.py

@@ -11,7 +11,6 @@ class TextSettingUI(QWidget):
 
     def __init__(self):
         super().__init__()
-        self.grid_layout = QGridLayout()
         self.grid_layout = QGridLayout(self)
         self.grid_layout.setContentsMargins(0, 0, 0, 0)
         self.grid_layout.setContentsMargins(0, 0, 0, 0)

pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "frontengine"
-version = "0.0.38"
+version = "0.0.39"
 authors = [
     { name = "JE-Chen", email = "[email protected]" },
 ]

tests/unit_test/start/extend_front_engine.py

@@ -0,0 +1,27 @@
+from PySide6.QtWidgets import QWidget, QGridLayout, QLineEdit, QPushButton, QLabel
+
+from frontengine import start_front_engine, EDITOR_EXTEND_TAB
+
+
+class TestUI(QWidget):
+
+    def __init__(self):
+        super().__init__()
+        self.grid_layout = QGridLayout(self)
+        self.grid_layout.setContentsMargins(0, 0, 0, 0)
+        self.grid_layout.setContentsMargins(0, 0, 0, 0)
+        self.label = QLabel("")
+        self.line_edit = QLineEdit()
+        self.submit_button = QPushButton("Submit")
+        self.submit_button.clicked.connect(self.show_input_text)
+        self.grid_layout.addWidget(self.label, 0, 0)
+        self.grid_layout.addWidget(self.line_edit, 1, 0)
+        self.grid_layout.addWidget(self.submit_button, 2, 0)
+
+    def show_input_text(self):
+        self.label.setText(self.line_edit.text())
+
+
+EDITOR_EXTEND_TAB.update({"test": TestUI})
+
+start_front_engine(debug=True)