Merge pull request #140 from Integration-Automation/dev

Dev

Author: JE-Chen

.idea/misc.xml

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

dev.toml

@@ -2,4 +2,5 @@ frontengine
 PySide6
 sphinx
 twine
-je_editor_dev
+je_editor_dev
+build

dev_requirements.txt

@@ -24,9 +24,7 @@ def __init__(self, filename: str, **kwargs):
         self.error_list: list = list()
 
     def replace_report_error(self, line_number, offset, text, check):
-        if text.startswith("W191"):
-            pass
-        else:
+        if not text.startswith("W191"):
             self.error_list.append(f"{text} on line: {line_number}, offset: {offset}")
 
     def check_all_format(self, expected=None, line_offset=0) -> int:

je_editor/pyside_ui/code/code_format/pep8_format.py

@@ -130,6 +130,11 @@ def exec_code(self, exec_file_name, exec_prefix: Union[str, list] = None) -> Non
             if self.process is not None:
                 self.process.terminate()
 
+    def full_exit_program(self):
+        self.timer.stop()
+        self.exit_program()
+        self.main_window.exec_program = None
+
     def pull_text(self) -> None:
         # Pull text from queue and put in code result area
         try:
@@ -149,13 +154,9 @@ def pull_text(self) -> None:
         except queue.Empty:
             pass
         if self.process.returncode == 0:
-            self.timer.stop()
-            self.exit_program()
-            self.main_window.exec_program = None
+            self.full_exit_program()
         elif self.process.returncode is not None:
-            self.timer.stop()
-            self.exit_program()
-            self.main_window.exec_program = None
+            self.full_exit_program()
         if self.still_run_program:
             # poll return code
             self.process.poll()

je_editor/pyside_ui/code/code_process/code_exec.py

@@ -77,11 +77,8 @@ def __init__(self, main_window: Union[EditorWidget, FullEditorWidget]):
 
     def check_env(self):
         path = venv_check()
-        try:
-            if path.exists():
-                self.env = jedi.create_environment(str(path))
-        except Exception as error:
-            raise error
+        if path.exists():
+            self.env = jedi.create_environment(str(path))
 
     def set_complete(self, list_to_complete: list) -> None:
         """

je_editor/pyside_ui/code/plaintext_code_edit/code_edit_plaintext.py

@@ -103,7 +103,7 @@ def __init__(self, debug_mode: bool = False, show_system_tray_ray: bool = False)
         # TAB Add
         self.tab_widget.addTab(EditorWidget(self), language_wrapper.language_word_dict.get("tab_name_editor"))
         self.tab_widget.addTab(
-            FrontEngineMainUI(show_system_tray_ray=False),
+            FrontEngineMainUI(show_system_tray_ray=False, redirect_output=False),
             language_wrapper.language_word_dict.get("tab_name_frontengine"))
         self.tab_widget.addTab(JEBrowser(), language_wrapper.language_word_dict.get("tab_name_web_browser"))
         self.tab_widget.addTab(

je_editor/pyside_ui/main_ui/main_editor.py

@@ -81,7 +81,7 @@ def add_dock_widget(ui_we_want_to_set: EditorMain, widget_type: str = None):
             dock_widget.setWidget(widget)
     elif widget_type == "frontengine":
         dock_widget.setWindowTitle(language_wrapper.language_word_dict.get("dock_frontengine_title"))
-        dock_widget.setWidget(FrontEngineMainUI())
+        dock_widget.setWidget(FrontEngineMainUI(redirect_output=False))
     elif widget_type == "ipython":
         dock_widget.setWindowTitle(language_wrapper.language_word_dict.get("dock_ipython_title"))
         dock_widget.setWidget(IpythonWidget(ui_we_want_to_set))

je_editor/pyside_ui/main_ui/menu/dock_menu/build_dock_menu.py

@@ -74,7 +74,7 @@ def add_editor_tab(ui_we_want_to_set: EditorMain):
 
 def add_frontengine_tab(ui_we_want_to_set: EditorMain):
     ui_we_want_to_set.tab_widget.addTab(
-        FrontEngineMainUI(show_system_tray_ray=False),
+        FrontEngineMainUI(show_system_tray_ray=False, redirect_output=False),
         f"{language_wrapper.language_word_dict.get('tab_menu_frontengine_tab_name')} "
         f"{ui_we_want_to_set.tab_widget.count()}")
 

je_editor/pyside_ui/main_ui/menu/tab_menu/build_tab_menu.py

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