Merge pull request #154 from Integration-Automation/dev

Dev

Author: JE-Chen

.github/workflows/dev_python3_9.yml renamed to .github/workflows/dev_python3_12.yml

@@ -17,10 +17,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - name: Set up Python 3.9
+      - name: Set up Python 3.12
         uses: actions/setup-python@v3
         with:
-          python-version: "3.9"
+          python-version: "3.12"
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip wheel

.github/workflows/stable_python3_9.yml renamed to .github/workflows/stable_python3_12.yml

@@ -17,10 +17,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - name: Set up Python 3.9
+      - name: Set up Python 3.12
         uses: actions/setup-python@v3
         with:
-          python-version: "3.9"
+          python-version: "3.12"
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip wheel

.idea/workspace.xml

@@ -6,24 +6,23 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "je_auto_control_dev"
-version = "0.0.111"
+version = "0.0.116"
 authors = [
     { name = "JE-Chen", email = "[email protected]" },
 ]
 description = "GUI Automation Framework"
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 license-files = ["LICENSE"]
 dependencies = [
     "je_open_cv",
     "pillow",
-    "Pyside6==6.9.0",
     "pyobjc-core;platform_system=='Darwin'",
     "pyobjc;platform_system=='Darwin'",
     "python-Xlib;platform_system=='Linux'",
     "mss"
 ]
 classifiers = [
-    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
     "Development Status :: 2 - Pre-Alpha",
     "Environment :: Win32 (MS Windows)",
     "Environment :: MacOS X",
@@ -44,4 +43,4 @@ content-type = "text/markdown"
 find = { namespaces = false }
 
 [project.optional-dependencies]
-gui = ["Pyside6", "qt-material"]
+gui = ["PySide6==6.9.1", "qt-material"]

dev.toml

@@ -0,0 +1,19 @@
+english_word_dict = {
+    # Main
+    "application_name": "AutoControlGUI",
+    # Widget
+    "interval_time": "Interval Time (s):",
+    "cursor_x": "Cursor X Position:",
+    "cursor_y": "Cursor Y Position:",
+    "mouse_button": "Mouse Button:",
+    "keyboard_button": "Keyboard Button:",
+    "click_type": "Click Type:",
+    "input_method": "Input Method:",
+    "mouse_radio": "Mouse",
+    "keyboard_radio": "Keyboard",
+    "repeat_until_stopped_radio": "Repeat until stopped",
+    "repeat_radio": "Repeat",
+    "times": "Times",
+    "start": "Start",
+    "stop": "Stop",
+}

je_auto_control/gui/__init__.py

@@ -0,0 +1,30 @@
+from je_auto_control.gui.language_wrapper.english import english_word_dict
+from je_auto_control.gui.language_wrapper.traditional_chinese import traditional_chinese_word_dict
+from je_auto_control.utils.logging.loggin_instance import autocontrol_logger
+
+
+
+class LanguageWrapper(object):
+
+    def __init__(
+            self
+    ):
+        autocontrol_logger.info("Init LanguageWrapper")
+        self.language: str = "English"
+        self.choose_language_dict = {
+            "English": english_word_dict,
+            "Traditional_Chinese": traditional_chinese_word_dict
+        }
+        self.language_word_dict: dict = self.choose_language_dict.get(self.language)
+
+    def reset_language(self, language) -> None:
+        autocontrol_logger.info(f"LanguageWrapper reset_language language: {language}")
+        if language in [
+            "English",
+            "Traditional_Chinese"
+        ]:
+            self.language = language
+            self.language_word_dict = self.choose_language_dict.get(self.language)
+
+
+language_wrapper = LanguageWrapper()

je_auto_control/gui/language_wrapper/__init__.py

@@ -0,0 +1,19 @@
+traditional_chinese_word_dict = {
+    # Main
+    "application_name": "AutoControlGUI",
+    # Widget
+    "interval_time": "間隔時間（秒）：",
+    "cursor_x": "滑鼠游標 X 軸位置：",
+    "cursor_y": "滑鼠游標 Y 軸位置：",
+    "mouse_button": "滑鼠按鍵：",
+    "keyboard_button": "鍵盤按鍵：",
+    "click_type": "點擊類型：",
+    "input_method": "輸入方式：",
+    "mouse_radio": "滑鼠",
+    "keyboard_radio": "鍵盤",
+    "repeat_until_stopped_radio": "重複直到停止",
+    "repeat_radio": "重複",
+    "times": "次數",
+    "start": "開始",
+    "stop": "停止",
+}

je_auto_control/gui/language_wrapper/english.py

@@ -0,0 +1,167 @@
+from PySide6.QtCore import QTimer
+from PySide6.QtGui import QIntValidator, QKeyEvent, Qt
+from PySide6.QtWidgets import (
+    QWidget, QLineEdit, QComboBox, QPushButton, QVBoxLayout, QLabel,
+    QGridLayout, QHBoxLayout, QRadioButton, QButtonGroup, QMessageBox
+)
+
+from je_auto_control.gui.language_wrapper.multi_language_wrapper import language_wrapper
+from je_auto_control.utils.executor.action_executor import execute_action
+from je_auto_control.wrapper.auto_control_keyboard import type_keyboard
+from je_auto_control.wrapper.auto_control_mouse import click_mouse
+from je_auto_control.wrapper.auto_control_record import record, stop_record
+from je_auto_control.wrapper.platform_wrapper import keyboard_keys_table, mouse_keys_table
+
+
+class AutoControlGUIWidget(QWidget):
+
+    def __init__(self, parent=None):
+        super().__init__(parent)
+
+        main_layout = QVBoxLayout()
+
+        # Grid for input fields
+        grid = QGridLayout()
+
+        # Interval time
+        grid.addWidget(QLabel(language_wrapper.language_word_dict.get("interval_time")), 0, 0)
+        self.interval_input = QLineEdit()
+        self.interval_input.setValidator(QIntValidator())
+        grid.addWidget(self.interval_input, 0, 1)
+
+        # Cursor X/Y
+        grid.addWidget(QLabel(language_wrapper.language_word_dict.get("cursor_x")), 2, 0)
+        self.cursor_x_input = QLineEdit()
+        self.cursor_x_input.setValidator(QIntValidator())
+        grid.addWidget(self.cursor_x_input, 2, 1)
+
+        grid.addWidget(QLabel(language_wrapper.language_word_dict.get("cursor_y")), 3, 0)
+        self.cursor_y_input = QLineEdit()
+        self.cursor_y_input.setValidator(QIntValidator())
+        grid.addWidget(self.cursor_y_input, 3, 1)
+
+        # Mouse button
+        grid.addWidget(QLabel(language_wrapper.language_word_dict.get("mouse_button")), 4, 0)
+        self.mouse_button_combo = QComboBox()
+        self.mouse_button_combo.addItems(mouse_keys_table)
+        grid.addWidget(self.mouse_button_combo, 4, 1)
+
+        # Keyboard button
+        grid.addWidget(QLabel(language_wrapper.language_word_dict.get("keyboard_button")), 5, 0)
+        self.keyboard_button_combo = QComboBox()
+        self.keyboard_button_combo.addItems(keyboard_keys_table.keys())
+        grid.addWidget(self.keyboard_button_combo, 5, 1)
+
+        # Click type
+        grid.addWidget(QLabel(language_wrapper.language_word_dict.get("click_type")), 6, 0)
+        self.click_type_combo = QComboBox()
+        self.click_type_combo.addItems(["Single Click", "Double Click"])
+        grid.addWidget(self.click_type_combo, 6, 1)
+
+        # Input method selection
+        grid.addWidget(QLabel(language_wrapper.language_word_dict.get("input_method")), 7, 0)
+        self.mouse_radio = QRadioButton(language_wrapper.language_word_dict.get("mouse_radio"))
+        self.keyboard_radio = QRadioButton(language_wrapper.language_word_dict.get("keyboard_radio"))
+        self.mouse_radio.setChecked(True)
+        self.input_method_group = QButtonGroup()
+        self.input_method_group.addButton(self.mouse_radio)
+        self.input_method_group.addButton(self.keyboard_radio)
+        grid.addWidget(self.mouse_radio, 7, 1)
+        grid.addWidget(self.keyboard_radio, 7, 2)
+
+        main_layout.addLayout(grid)
+
+        # Repeat options
+        repeat_layout = QHBoxLayout()
+        self.repeat_until_stopped = QRadioButton(language_wrapper.language_word_dict.get("repeat_until_stopped_radio"))
+        self.repeat_count_times = QRadioButton(language_wrapper.language_word_dict.get("repeat_radio"))
+        self.repeat_count_input = QLineEdit()
+        self.repeat_count_input.setValidator(QIntValidator())
+        self.repeat_count_input.setPlaceholderText(language_wrapper.language_word_dict.get("times"))
+        repeat_group = QButtonGroup()
+        repeat_group.addButton(self.repeat_until_stopped)
+        repeat_group.addButton(self.repeat_count_times)
+        self.repeat_until_stopped.setChecked(True)
+        self.repeat_count = 0
+        self.repeat_max = 0
+
+        repeat_layout.addWidget(self.repeat_until_stopped)
+        repeat_layout.addWidget(self.repeat_count_times)
+        repeat_layout.addWidget(self.repeat_count_input)
+        main_layout.addLayout(repeat_layout)
+
+        # Start/Stop buttons
+        button_layout = QHBoxLayout()
+        self.start_button = QPushButton(language_wrapper.language_word_dict.get("start"))
+        self.start_button.clicked.connect(self.start_autocontrol)
+        self.stop_button = QPushButton(language_wrapper.language_word_dict.get("stop"))
+        self.stop_button.clicked.connect(self.stop_autocontrol)
+        button_layout.addWidget(self.start_button)
+        button_layout.addWidget(self.stop_button)
+        main_layout.addLayout(button_layout)
+
+        # Timer
+        self.start_autocontrol_timer = QTimer()
+
+        # Connect input method toggle
+        self.mouse_radio.toggled.connect(self.update_input_mode)
+        self.keyboard_radio.toggled.connect(self.update_input_mode)
+        self.update_input_mode()
+
+        self.setLayout(main_layout)
+
+    def update_input_mode(self):
+        use_mouse = self.mouse_radio.isChecked()
+        self.cursor_x_input.setEnabled(use_mouse)
+        self.cursor_y_input.setEnabled(use_mouse)
+        self.mouse_button_combo.setEnabled(use_mouse)
+        self.keyboard_button_combo.setEnabled(not use_mouse)
+
+    def start_autocontrol(self):
+        self.start_autocontrol_timer.setInterval(int(self.interval_input.text()))
+        self.start_autocontrol_timer.timeout.connect(lambda: self.start_timer_function())
+        self.start_autocontrol_timer.start()
+        self.repeat_max = int(self.repeat_count_input.text())
+
+    def start_timer_function(self):
+        if self.repeat_until_stopped.isChecked():
+            self.trigger_autocontrol_function()
+        elif self.repeat_count_times.isChecked():
+            self.repeat_count += 1
+            if self.repeat_count < self.repeat_max:
+                self.trigger_autocontrol_function()
+            else:
+                self.repeat_count = 0
+                self.repeat_max = 0
+                self.start_autocontrol_timer.stop()
+
+    def trigger_autocontrol_function(self):
+        click_type = self.click_type_combo.currentText()
+        if self.mouse_radio.isChecked():
+            trigger_function = click_mouse
+            button = self.mouse_button_combo.currentText()
+            x = int(self.cursor_x_input.text())
+            y = int(self.cursor_y_input.text())
+            if click_type == "Single Click":
+                trigger_function(mouse_keycode=button, x=x, y=y)
+            elif click_type == "Double Click":
+                trigger_function(mouse_keycode=button, x=x, y=y)
+                trigger_function(mouse_keycode=button, x=x, y=y)
+        elif self.keyboard_radio.isChecked():
+            trigger_function = type_keyboard
+            button = self.keyboard_button_combo.currentText()
+            if click_type == "Single Click":
+                trigger_function(keycode=button)
+            elif click_type == "Double Click":
+                trigger_function(keycode=button)
+                trigger_function(keycode=button)
+
+    def stop_autocontrol(self):
+        self.start_autocontrol_timer.stop()
+
+
+    def keyPressEvent(self, event: QKeyEvent):
+        if event.modifiers() == Qt.KeyboardModifier.ControlModifier and event.key() == Qt.Key.Key_4:
+            self.start_autocontrol_timer.stop()
+        else:
+            super().keyPressEvent(event)