Merge pull request #139 from Integration-Automation/dev

JE-Chen · web-flow · commit 709dd158863e · 2024-07-11T17:07:47.000+08:00
Dev
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/dev.toml b/dev.toml
@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "je_auto_control_dev"
-version = "0.0.97"
+version = "0.0.98"
 authors = [
     { name = "JE-Chen", email = "jechenmailman@gmail.com" },
 ]
@@ -45,3 +45,6 @@ license-files = ["LICENSE"]
 
 [tool.setuptools.packages]
 find = { namespaces = false }
+
+[project.optional-dependencies]
+gui = ["Pyside6", "qt-material"]
diff --git a/dev_requirements.txt b/dev_requirements.txt
@@ -2,4 +2,6 @@ je_auto_control_dev
 wheel
 twine
 sphinx
-sphinx-rtd-theme
+sphinx-rtd-theme
+Pyside6
+qt-material
diff --git a/exe/je_driver_icon.ico b/exe/je_driver_icon.ico
diff --git a/exe/start_autocontrol_gui.py b/exe/start_autocontrol_gui.py
@@ -0,0 +1,3 @@
+from je_auto_control import start_autocontrol_gui
+
+start_autocontrol_gui()
diff --git a/je_auto_control/__init__.py b/je_auto_control/__init__.py
@@ -104,7 +104,8 @@
 # import screen
 from je_auto_control.wrapper.auto_control_screen import screen_size
 from je_auto_control.wrapper.auto_control_screen import screenshot
-
+# GUI
+from je_auto_control.gui.main_window import start_autocontrol_gui
 __all__ = [
     "click_mouse", "mouse_keys_table", "get_mouse_position", "press_mouse", "release_mouse",
     "mouse_scroll", "set_mouse_position", "special_mouse_keys_table",
@@ -120,4 +121,5 @@
     "generate_html", "generate_html_report", "generate_json", "generate_json_report", "generate_xml",
     "generate_xml_report", "get_dir_files_as_list", "create_project_dir", "start_autocontrol_socket_server",
     "callback_executor", "package_manager", "get_special_table", "ShellManager", "default_shell_manager",
+    "start_autocontrol_gui"
 ]
diff --git a/je_auto_control/__main__.py b/je_auto_control/__main__.py
@@ -25,7 +25,11 @@ def preprocess_execute_files(file_path: str):
 
 
         def preprocess_read_str_execute_action(execute_str: str):
-            execute_str = json.loads(execute_str)
+            if sys.platform in ["win32", "cygwin", "msys"]:
+                json_data = json.loads(execute_str)
+                execute_str = json.loads(json_data)
+            else:
+                execute_str = json.loads(execute_str)
             execute_action(execute_str)
 
 
diff --git a/je_auto_control/gui/__init__.py b/je_auto_control/gui/__init__.py
diff --git a/je_auto_control/gui/main_widget.py b/je_auto_control/gui/main_widget.py
@@ -0,0 +1,20 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from je_auto_control.gui.main_window import AutoControlGUI
+
+from PySide6.QtWidgets import QWidget, QGridLayout
+
+
+class AutoControlWidget(QWidget):
+
+    def __init__(self, main_ui: AutoControlGUI):
+        super().__init__()
+        # Variable
+        self.main_ui = main_ui
+        # UI component
+        # Grid layout
+        self.grid_layout = QGridLayout()
+        self.setLayout(self.grid_layout)
diff --git a/je_auto_control/gui/main_window.py b/je_auto_control/gui/main_window.py
@@ -0,0 +1,44 @@
+import os
+import sys
+from pathlib import Path
+
+from PySide6.QtCore import QCoreApplication, QTimer
+from PySide6.QtGui import QIcon
+from PySide6.QtWidgets import QMainWindow, QApplication
+from qt_material import apply_stylesheet
+
+from je_auto_control.gui.main_widget import AutoControlWidget
+
+
+class AutoControlGUI(QMainWindow):
+
+    def __init__(self, debug_mode: bool = False):
+        super().__init__()
+        self.debug_mode = debug_mode
+        self.central_widget = AutoControlWidget(self)
+        self.setCentralWidget(self.central_widget)
+        self.setWindowTitle("AutoControlGUI")
+        # Set Icon
+        self.icon_path = Path(os.getcwd() + "/je_driver_icon.ico")
+        self.icon = QIcon(str(self.icon_path))
+        if self.icon.isNull() is False:
+            self.setWindowIcon(self.icon)
+        if self.debug_mode:
+            close_timer = QTimer(self)
+            close_timer.setInterval(10000)
+            close_timer.timeout.connect(self.debug_close)
+            close_timer.start()
+
+    @classmethod
+    def debug_close(cls):
+        sys.exit(0)
+
+
+def start_autocontrol_gui(debug_mode: bool = False) -> None:
+    autocontrol_gui = QCoreApplication.instance()
+    if autocontrol_gui is None:
+        autocontrol_gui = QApplication(sys.argv)
+    window = AutoControlGUI(debug_mode)
+    apply_stylesheet(autocontrol_gui, theme='dark_amber.xml')
+    window.showMaximized()
+    sys.exit(autocontrol_gui.exec())
diff --git a/pyproject.toml b/pyproject.toml
@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "je_auto_control"
-version = "0.0.156"
+version = "0.0.157"
 authors = [
     { name = "JE-Chen", email = "jechenmailman@gmail.com" },
 ]
@@ -46,3 +46,6 @@ license-files = ["LICENSE"]
 
 [tool.setuptools.packages]
 find = { namespaces = false }
+
+[project.optional-dependencies]
+gui = ["Pyside6", "qt-material"]
diff --git a/requirements.txt b/requirements.txt
@@ -1 +1,3 @@
 je_auto_control
+Pyside6
+qt-material

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+from je_auto_control import start_autocontrol_gui`
	`2`	`+`
	`3`	`+start_autocontrol_gui()`