Refactor

Author: JE-Chen

automation_editor/automation_editor_ui/editor_main/main_ui.py

@@ -7,18 +7,7 @@
 from qt_material import apply_stylesheet
 
 from automation_editor.automation_editor_ui.complete.complete_extend import complete_extend_package
-from automation_editor.automation_editor_ui. \
-    menu.api_testka_menu.build_api_testka_menu import set_apitestka_menu
-from automation_editor.automation_editor_ui. \
-    menu.auto_control_menu.build_autocontrol_menu import set_autocontrol_menu
-from automation_editor.automation_editor_ui.menu.automation_file_menu.build_automation_file_menu import \
-    set_automation_file_menu
-from automation_editor.automation_editor_ui.menu.install_menu.build_install_menu import set_install_menu
-from automation_editor.automation_editor_ui.menu. \
-    load_density_menu.build_load_density_menu import set_load_density_menu
-from automation_editor.automation_editor_ui.menu.mail_thunder_menu.build_mail_thunder_menu import set_mail_thunder_menu
-from automation_editor.automation_editor_ui \
-    .menu.web_runner_menu.build_webrunner_menu import set_web_runner_menu
+from automation_editor.automation_editor_ui.menu.build_menubar import add_menu_to_menubar
 from automation_editor.automation_editor_ui.syntax.syntax_extend import \
     syntax_extend_package
 
@@ -30,14 +19,12 @@ class AutomationEditor(EditorMain):
     def __init__(self, debug_mode: bool = False):
         super().__init__()
         self.current_run_code_window: List[QWidget] = list()
+        # Project compiler if user not choose this will use which to find
+        self.python_compiler = None
+        # Delete JEditor help
         self.help_menu.deleteLater()
-        set_autocontrol_menu(self)
-        set_apitestka_menu(self)
-        set_load_density_menu(self)
-        set_web_runner_menu(self)
-        set_automation_file_menu(self)
-        set_mail_thunder_menu(self)
-        set_install_menu(self)
+        # Menu
+        add_menu_to_menubar(self)
         syntax_extend_package(self)
         complete_extend_package(self)
         # System tray change

…itor_ui/menu/api_testka_menu/__init__.py …itor_ui/menu/automation_menu/__init__.pyautomation_editor/automation_editor_ui/menu/api_testka_menu/__init__.py renamed to automation_editor/automation_editor_ui/menu/automation_menu/__init__.py automation_editor/automation_editor_ui/menu/api_testka_menu/__init__.py renamed to automation_editor/automation_editor_ui/menu/automation_menu/__init__.py

@@ -20,7 +20,7 @@ def set_apitestka_menu(ui_we_want_to_set: AutomationEditor):
     :param ui_we_want_to_set: main window to add menu.
     :return: None
     """
-    ui_we_want_to_set.apitestka_menu = ui_we_want_to_set.menu.addMenu("APITestka")
+    ui_we_want_to_set.apitestka_menu = ui_we_want_to_set.automation_menu.addMenu("APITestka")
     ui_we_want_to_set.apitestka_run_menu = ui_we_want_to_set.apitestka_menu.addMenu("Run")
     # Run APITestka Script
     ui_we_want_to_set.run_apitestka_action = QAction("Run APITestka Script")

…or_ui/menu/auto_control_menu/__init__.py …omation_menu/api_testka_menu/__init__.pyautomation_editor/automation_editor_ui/menu/auto_control_menu/__init__.py renamed to automation_editor/automation_editor_ui/menu/automation_menu/api_testka_menu/__init__.py automation_editor/automation_editor_ui/menu/auto_control_menu/__init__.py renamed to automation_editor/automation_editor_ui/menu/automation_menu/api_testka_menu/__init__.py

@@ -24,7 +24,7 @@ def set_autocontrol_menu(ui_we_want_to_set: AutomationEditor):
     :param ui_we_want_to_set: main window to add menu.
     :return: None
     """
-    ui_we_want_to_set.autocontrol_menu = ui_we_want_to_set.menu.addMenu("AutoControl")
+    ui_we_want_to_set.autocontrol_menu = ui_we_want_to_set.automation_menu.addMenu("AutoControl")
     ui_we_want_to_set.autocontrol_run_menu = ui_we_want_to_set.autocontrol_menu.addMenu("Run")
     # Run AutoControl Script
     ui_we_want_to_set.run_autocontrol_action = QAction("Run AutoControl Script")

…api_testka_menu/build_api_testka_menu.py …api_testka_menu/build_api_testka_menu.pyautomation_editor/automation_editor_ui/menu/api_testka_menu/build_api_testka_menu.py renamed to automation_editor/automation_editor_ui/menu/automation_menu/api_testka_menu/build_api_testka_menu.py automation_editor/automation_editor_ui/menu/api_testka_menu/build_api_testka_menu.py renamed to automation_editor/automation_editor_ui/menu/automation_menu/api_testka_menu/build_api_testka_menu.py

@@ -21,7 +21,7 @@ def set_automation_file_menu(ui_we_want_to_set: AutomationEditor):
     :param ui_we_want_to_set: main window to add menu.
     :return: None
     """
-    ui_we_want_to_set.automation_file_menu = ui_we_want_to_set.menu.addMenu("FileAutomation")
+    ui_we_want_to_set.automation_file_menu = ui_we_want_to_set.automation_menu.addMenu("FileAutomation")
     ui_we_want_to_set.automation_run_file_menu = ui_we_want_to_set.automation_file_menu.addMenu("Run")
     # Run FileAutomation Script
     ui_we_want_to_set.run_file_automation_action = QAction("Run FileAutomation Script")

…ui/menu/automation_file_menu/__init__.py …ation_menu/auto_control_menu/__init__.pyautomation_editor/automation_editor_ui/menu/automation_file_menu/__init__.py renamed to automation_editor/automation_editor_ui/menu/automation_menu/auto_control_menu/__init__.py automation_editor/automation_editor_ui/menu/automation_file_menu/__init__.py renamed to automation_editor/automation_editor_ui/menu/automation_menu/auto_control_menu/__init__.py

@@ -21,7 +21,7 @@ def set_load_density_menu(ui_we_want_to_set: AutomationEditor):
     :param ui_we_want_to_set: main window to add menu.
     :return: None
     """
-    ui_we_want_to_set.load_density_menu = ui_we_want_to_set.menu.addMenu("LoadDensity")
+    ui_we_want_to_set.load_density_menu = ui_we_want_to_set.automation_menu.addMenu("LoadDensity")
     ui_we_want_to_set.load_density_run_menu = ui_we_want_to_set.load_density_menu.addMenu("Run")
     # Run LoadDensity Script
     ui_we_want_to_set.run_load_density_action = QAction("Run LoadDensity Script")