je-editor 0.0.212__tar.gz → 0.0.214__tar.gz

{je_editor-0.0.212 → je_editor-0.0.214}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: je_editor
-Version: 0.0.212
+Version: 0.0.214
 Summary: JEditor is basic but powerful editor include GPT
 Author-email: JE-Chen <jechenmailman@gmail.com>
 Project-URL: Homepage, https://github.com/JE-Chen/je_editor

{je_editor-0.0.212 → je_editor-0.0.214}/je_editor/pyside_ui/code/code_process/code_exec.py

@@ -8,6 +8,7 @@ from threading import Thread
 from typing import Union
 
 from PySide6.QtCore import QTimer
+from PySide6.QtGui import QTextCharFormat
 from PySide6.QtWidgets import QTextEdit
 
 from je_editor.pyside_ui.code.running_process_manager import run_instance_manager
@@ -43,6 +44,7 @@ class ExecManager(object):
         self.main_window: EditorWidget = main_window
         self.compiler_path = None
         self.code_result: Union[QTextEdit, None] = None
+        self.code_result_cursor: Union[QTextEdit.textCursor, None] = None
         self.timer: Union[QTimer, None] = None
         self.still_run_program = True
         self.process: Union[subprocess.Popen, None] = None
@@ -86,7 +88,6 @@ class ExecManager(object):
                             f"exec_prefix: {exec_prefix}")
         try:
             self.exit_program()
-            self.code_result.setTextColor(actually_color_dict.get("normal_output_color"))
             self.code_result.setPlainText("")
             file_path = Path(exec_file_name)
             reformat_os_file_path = str(file_path.absolute())
@@ -127,7 +128,11 @@ class ExecManager(object):
             )
             self.read_program_error_output_from_thread.start()
             # show which file execute
-            self.code_result.append(self.compiler_path + " " + reformat_os_file_path)
+            text_cursor = self.code_result.textCursor()
+            text_format = QTextCharFormat()
+            text_format.setForeground(actually_color_dict.get("normal_output_color"))
+            text_cursor.insertText(self.compiler_path + " " + reformat_os_file_path, text_format)
+            text_cursor.insertBlock()
             # start tkinter_ui update
             # start timer
             self.timer = QTimer(self.main_window)
@@ -135,9 +140,11 @@ class ExecManager(object):
             self.timer.timeout.connect(self.pull_text)
             self.timer.start()
         except Exception as error:
-            self.code_result.setTextColor(actually_color_dict.get("error_output_color"))
-            self.code_result.append(str(error))
-            self.code_result.setTextColor(actually_color_dict.get("normal_output_color"))
+            text_cursor = self.code_result.textCursor()
+            text_format = QTextCharFormat()
+            text_format.setForeground(actually_color_dict.get("normal_output_color"))
+            text_cursor.insertText(str(error), text_format)
+            text_cursor.insertBlock()
             if self.process is not None:
                 self.process.terminate()
 
@@ -151,19 +158,24 @@ class ExecManager(object):
         jeditor_logger.info("ExecManager pull_text")
         # Pull text from queue and put in code result area
         try:
-            self.code_result.setTextColor(actually_color_dict.get("normal_output_color"))
             if not self.run_output_queue.empty():
                 output_message = self.run_output_queue.get_nowait()
                 output_message = str(output_message).strip()
                 if output_message:
-                    self.code_result.append(output_message)
-            self.code_result.setTextColor(actually_color_dict.get("error_output_color"))
+                    text_cursor = self.code_result.textCursor()
+                    text_format = QTextCharFormat()
+                    text_format.setForeground(actually_color_dict.get("normal_output_color"))
+                    text_cursor.insertText(output_message, text_format)
+                    text_cursor.insertBlock()
             if not self.run_error_queue.empty():
                 error_message = self.run_error_queue.get_nowait()
                 error_message = str(error_message).strip()
                 if error_message:
-                    self.code_result.append(error_message)
-            self.code_result.setTextColor(actually_color_dict.get("normal_output_color"))
+                    text_cursor = self.code_result.textCursor()
+                    text_format = QTextCharFormat()
+                    text_format.setForeground(actually_color_dict.get("error_output_color"))
+                    text_cursor.insertText(error_message, text_format)
+                    text_cursor.insertBlock()
         except queue.Empty:
             pass
         if self.process.returncode == 0:
@@ -185,7 +197,11 @@ class ExecManager(object):
         self.print_and_clear_queue()
         if self.process is not None:
             self.process.terminate()
-            self.code_result.append(f"Program exit with code {self.process.returncode}")
+            text_cursor = self.code_result.textCursor()
+            text_format = QTextCharFormat()
+            text_format.setForeground(actually_color_dict.get("normal_output_color"))
+            text_cursor.insertText(f"Program exit with code {self.process.returncode}", text_format)
+            text_cursor.insertBlock()
             self.process = None
 
     # Pull all remain string on queue and add to code result area
@@ -197,7 +213,7 @@ class ExecManager(object):
     def read_program_output_from_process(self) -> None:
         jeditor_logger.info("ExecManager read_program_output_from_process")
         while self.still_run_program:
-            program_output_data: str = self.process.stdout.read(
+            program_output_data: str = self.process.stdout.readline(
                 self.program_buffer).decode(self.program_encoding, "replace")
             if self.process:
                 self.process.stdout.flush()
@@ -206,7 +222,7 @@ class ExecManager(object):
     def read_program_error_output_from_process(self) -> None:
         jeditor_logger.info("ExecManager read_program_error_output_from_process")
         while self.still_run_program:
-            program_error_output_data: str = self.process.stderr.read(
+            program_error_output_data: str = self.process.stderr.readline(
                 self.program_buffer).decode(self.program_encoding, "replace")
             if self.process:
                 self.process.stderr.flush()

{je_editor-0.0.212 → je_editor-0.0.214}/je_editor/pyside_ui/code/shell_process/shell_exec.py

@@ -10,6 +10,7 @@ from threading import Thread
 from typing import Union, Callable
 
 from PySide6.QtCore import QTimer
+from PySide6.QtGui import QTextCharFormat
 from PySide6.QtWidgets import QTextEdit
 
 from je_editor.pyside_ui.code.running_process_manager import run_instance_manager
@@ -48,8 +49,8 @@ class ShellManager(object):
         self.timer: Union[QTimer, None] = None
         self.still_run_shell: bool = True
         self.process = None
-        self.run_output_queue: queue = queue.Queue()
-        self.run_error_queue: queue = queue.Queue()
+        self.run_output_queue: queue.Queue = queue.Queue()
+        self.run_error_queue: queue.Queue = queue.Queue()
         self.program_encoding: str = shell_encoding
         self.program_buffer: int = program_buffer
         self.after_done_function = after_done_function
@@ -75,7 +76,7 @@ class ShellManager(object):
         else:
             raise JEditorException(je_editor_init_error)
 
-    def exec_shell(self, shell_command: [str, list]) -> None:
+    def exec_shell(self, shell_command: Union[str, list]) -> None:
         """
         :param shell_command: shell command will run
         :return: if error return result and True else return result and False
@@ -83,13 +84,16 @@ class ShellManager(object):
         jeditor_logger.info(f"ShellManager exec_shell, shell_command: {shell_command}")
         try:
             self.exit_program()
-            self.code_result.setTextColor(actually_color_dict.get("normal_output_color"))
             self.code_result.setPlainText("")
             if sys.platform in ["win32", "cygwin", "msys"]:
                 args = shell_command
             else:
                 args = shlex.split(shell_command)
-            self.code_result.append(str(args))
+            text_cursor = self.code_result.textCursor()
+            text_format = QTextCharFormat()
+            text_format.setForeground(actually_color_dict.get("normal_output_color"))
+            text_cursor.insertText(str(args), text_format)
+            text_cursor.insertBlock()
             self.process = subprocess.Popen(
                 args=args,
                 stdout=subprocess.PIPE,
@@ -116,9 +120,11 @@ class ShellManager(object):
             self.timer.timeout.connect(self.pull_text)
             self.timer.start()
         except Exception as error:
-            self.code_result.setTextColor(actually_color_dict.get("error_output_color"))
-            self.code_result.append(str(error))
-            self.code_result.setTextColor(actually_color_dict.get("normal_output_color"))
+            text_cursor = self.code_result.textCursor()
+            text_format = QTextCharFormat()
+            text_format.setForeground(actually_color_dict.get("error_output_color"))
+            text_cursor.insertText(str(error), text_format)
+            text_cursor.insertBlock()
             if self.process is not None:
                 self.process.terminate()
 
@@ -126,19 +132,24 @@ class ShellManager(object):
     def pull_text(self) -> None:
         jeditor_logger.info("ShellManager pull_text")
         try:
-            self.code_result.setTextColor(actually_color_dict.get("normal_output_color"))
             if not self.run_output_queue.empty():
                 output_message = self.run_output_queue.get_nowait()
                 output_message = str(output_message).strip()
                 if output_message:
-                    self.code_result.append(output_message)
-            self.code_result.setTextColor(actually_color_dict.get("error_output_color"))
+                    text_cursor = self.code_result.textCursor()
+                    text_format = QTextCharFormat()
+                    text_format.setForeground(actually_color_dict.get("normal_output_color"))
+                    text_cursor.insertText(output_message, text_format)
+                    text_cursor.insertBlock()
             if not self.run_error_queue.empty():
                 error_message = self.run_error_queue.get_nowait()
                 error_message = str(error_message).strip()
                 if error_message:
-                    self.code_result.append(error_message)
-            self.code_result.setTextColor(actually_color_dict.get("normal_output_color"))
+                    text_cursor = self.code_result.textCursor()
+                    text_format = QTextCharFormat()
+                    text_format.setForeground(actually_color_dict.get("error_output_color"))
+                    text_cursor.insertText(error_message, text_format)
+                    text_cursor.insertBlock()
         except queue.Empty:
             pass
         if self.process.returncode == 0:
@@ -168,7 +179,11 @@ class ShellManager(object):
         self.print_and_clear_queue()
         if self.process is not None:
             self.process.terminate()
-            self.code_result.append(f"Shell command exit with code {self.process.returncode}")
+            text_cursor = self.code_result.textCursor()
+            text_format = QTextCharFormat()
+            text_format.setForeground(actually_color_dict.get("normal_output_color"))
+            text_cursor.insertText(f"Shell command exit with code {self.process.returncode}", text_format)
+            text_cursor.insertBlock()
             self.process = None
 
     def print_and_clear_queue(self) -> None:
@@ -179,7 +194,7 @@ class ShellManager(object):
     def read_program_output_from_process(self) -> None:
         jeditor_logger.info("ShellManager read_program_output_from_process")
         while self.still_run_shell:
-            program_output_data = self.process.stdout.read(
+            program_output_data = self.process.stdout.readline(
                 self.program_buffer) \
                 .decode(self.program_encoding, "replace")
             if self.process:
@@ -189,7 +204,7 @@ class ShellManager(object):
     def read_program_error_output_from_process(self) -> None:
         jeditor_logger.info("ShellManager read_program_error_output_from_process")
         while self.still_run_shell:
-            program_error_output_data = self.process.stderr.read(
+            program_error_output_data = self.process.stderr.readline(
                 self.program_buffer) \
                 .decode(self.program_encoding, "replace")
             if self.process:

{je_editor-0.0.212 → je_editor-0.0.214}/je_editor/pyside_ui/main_ui/editor/editor_widget.py

@@ -2,6 +2,8 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING
 
+from PySide6.QtGui import QTextCharFormat
+
 from je_editor.utils.logging.loggin_instance import jeditor_logger
 from je_editor.utils.multi_language.multi_language_wrapper import language_wrapper
 
@@ -38,7 +40,7 @@ class EditorWidget(QWidget):
         self.checker: Union[PEP8FormatChecker, None] = None
         self.current_file = None
         self.tree_view_scroll_area = None
-        self.project_treeview = None
+        self.project_treeview: Union[QTreeView, None] = None
         self.project_treeview_model = None
         self.python_compiler = None
         self.main_window = main_window
@@ -64,6 +66,7 @@ class EditorWidget(QWidget):
         # code edit and code result plaintext
         self.code_edit = CodeEditor(self)
         self.code_result = CodeRecord()
+        self.code_result_cursor = self.code_result.textCursor()
         self.code_edit_scroll_area = QScrollArea()
         self.code_edit_scroll_area.setWidgetResizable(True)
         self.code_edit_scroll_area.setViewportMargins(0, 0, 0, 0)
@@ -74,7 +77,6 @@ class EditorWidget(QWidget):
         self.code_result_scroll_area.setWidget(self.code_result)
         # Code format checker
         self.format_check_result = CodeRecord()
-        self.format_check_result.setTextColor(actually_color_dict.get("warning_output_color"))
         # Debugger
         self.debugger_result = CodeRecord()
         # Code result tab
@@ -192,7 +194,11 @@ class EditorWidget(QWidget):
                 self.checker.check_all_format()
                 self.format_check_result.setPlainText("")
                 for error in self.checker.error_list:
-                    self.format_check_result.append(error)
+                    text_cursor = self.format_check_result.textCursor()
+                    text_format = QTextCharFormat()
+                    text_format.setForeground(actually_color_dict.get("error_output_color"))
+                    text_cursor.insertText(error, text_format)
+                    text_cursor.insertBlock()
                 self.checker.error_list.clear()
             else:
                 message_box = QMessageBox()

{je_editor-0.0.212 → je_editor-0.0.214}/je_editor/pyside_ui/main_ui/main_editor.py

@@ -6,7 +6,7 @@ from typing import Dict, Type
 
 import jedi.settings
 from PySide6.QtCore import QTimer, QEvent
-from PySide6.QtGui import QFontDatabase, QIcon, Qt
+from PySide6.QtGui import QFontDatabase, QIcon, Qt, QTextCharFormat
 from PySide6.QtWidgets import QMainWindow, QWidget, QTabWidget, QMessageBox
 from frontengine import FrontEngineMainUI
 from qt_material import QtStyleTools
@@ -16,7 +16,7 @@ from je_editor.pyside_ui.code.auto_save.auto_save_manager import init_new_auto_s
 from je_editor.pyside_ui.main_ui.editor.editor_widget import EditorWidget
 from je_editor.pyside_ui.main_ui.menu.set_menu_bar import set_menu_bar
 from je_editor.pyside_ui.main_ui.save_settings.user_color_setting_file import write_user_color_setting, \
-    read_user_color_setting, update_actually_color_dict
+    read_user_color_setting, update_actually_color_dict, actually_color_dict
 from je_editor.pyside_ui.main_ui.save_settings.user_setting_file import user_setting_dict, read_user_setting, \
     write_user_setting
 from je_editor.pyside_ui.main_ui.system_tray.extend_system_tray import ExtendSystemTray
@@ -141,14 +141,20 @@ class EditorMain(QMainWindow, QtStyleTools):
                     output_message = redirect_manager_instance.std_out_queue.get_nowait()
                     output_message = str(output_message).strip()
                     if output_message:
-                        widget.code_result.append(output_message)
-                widget.code_result.setTextColor(Qt.GlobalColor.red)
+                        text_cursor = self.code_result.textCursor()
+                        text_format = QTextCharFormat()
+                        text_format.setForeground(actually_color_dict.get("normal_output_color"))
+                        text_cursor.insertText(output_message, text_format)
+                        text_cursor.insertBlock()
                 if not redirect_manager_instance.std_err_queue.empty():
                     error_message = redirect_manager_instance.std_err_queue.get_nowait()
                     error_message = str(error_message).strip()
                     if error_message:
-                        widget.code_result.append(error_message)
-                widget.code_result.setTextColor(Qt.GlobalColor.black)
+                        text_cursor = self.code_result.textCursor()
+                        text_format = QTextCharFormat()
+                        text_format.setForeground(actually_color_dict.get("error_output_color"))
+                        text_cursor.insertText(error_message, text_format)
+                        text_cursor.insertBlock()
                 break
 
     def startup_setting(self) -> None:

{je_editor-0.0.212 → je_editor-0.0.214}/je_editor/pyside_ui/main_ui/menu/dock_menu/build_dock_menu.py

@@ -10,8 +10,8 @@ from frontengine import FrontEngineMainUI
 
 from je_editor.pyside_ui.browser.browser_widget import BrowserWidget
 from je_editor.pyside_ui.code.variable_inspector.inspector_gui import VariableInspector
-from je_editor.pyside_ui.git.git_branch_tree_widget import GitTreeViewGUI
-from je_editor.pyside_ui.git.git_client_gui import Gitgui
+from je_editor.pyside_ui.git_feature.git_branch_tree_widget import GitTreeViewGUI
+from je_editor.pyside_ui.git_feature.git_client_gui import Gitgui
 from je_editor.pyside_ui.main_ui.ai_widget.chat_ui import ChatUI
 from je_editor.pyside_ui.main_ui.console_widget.console_gui import ConsoleWidget
 from je_editor.pyside_ui.main_ui.dock.destroy_dock import DestroyDock

{je_editor-0.0.212 → je_editor-0.0.214}/je_editor/pyside_ui/main_ui/menu/python_env_menu/build_venv_menu.py

@@ -2,6 +2,8 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING
 
+from je_editor.pyside_ui.main_ui.save_settings.user_color_setting_file import actually_color_dict
+
 from je_editor.pyside_ui.main_ui.editor.editor_widget import EditorWidget
 from je_editor.pyside_ui.main_ui.save_settings.user_setting_file import user_setting_dict
 from je_editor.utils.logging.loggin_instance import jeditor_logger
@@ -11,7 +13,7 @@ if TYPE_CHECKING:
 import os
 from pathlib import Path
 
-from PySide6.QtGui import QAction, QKeySequence
+from PySide6.QtGui import QAction, QKeySequence, QTextCharFormat
 from PySide6.QtWidgets import QMessageBox, QInputDialog, QFileDialog
 
 from je_editor.pyside_ui.code.shell_process.shell_exec import ShellManager
@@ -76,8 +78,12 @@ def create_venv(ui_we_want_to_set: EditorMain) -> None:
             create_venv_shell.exec_shell(
                 [f"{create_venv_shell.compiler_path}", "-m", "venv", "venv"]
             )
-            widget.code_result.append(
-                language_wrapper.language_word_dict.get("python_env_menu_creating_venv_message"))
+            text_cursor =  widget.code_result.textCursor()
+            text_format = QTextCharFormat()
+            text_format.setForeground(actually_color_dict.get("normal_output_color"))
+            text_cursor.insertText(
+                language_wrapper.language_word_dict.get("python_env_menu_creating_venv_message"), text_format)
+            text_cursor.insertBlock()
         else:
             message_box = QMessageBox()
             message_box.setText(

{je_editor-0.0.212 → je_editor-0.0.214}/je_editor/pyside_ui/main_ui/menu/tab_menu/build_tab_menu.py

@@ -6,8 +6,8 @@ from frontengine import FrontEngineMainUI
 
 from je_editor.pyside_ui.browser.browser_widget import BrowserWidget
 from je_editor.pyside_ui.code.variable_inspector.inspector_gui import VariableInspector
-from je_editor.pyside_ui.git.git_branch_tree_widget import GitTreeViewGUI
-from je_editor.pyside_ui.git.git_client_gui import Gitgui
+from je_editor.pyside_ui.git_feature.git_branch_tree_widget import GitTreeViewGUI
+from je_editor.pyside_ui.git_feature.git_client_gui import Gitgui
 from je_editor.pyside_ui.main_ui.ai_widget.chat_ui import ChatUI
 from je_editor.pyside_ui.main_ui.console_widget.console_gui import ConsoleWidget
 from je_editor.pyside_ui.main_ui.editor.editor_widget import EditorWidget

{je_editor-0.0.212 → je_editor-0.0.214}/je_editor/utils/multi_language/english.py

@@ -169,7 +169,7 @@ please make sure that the current encoding is consistent with the default encodi
     "err_read_diff": "Failed to read diff",
     "err_stage": "Stage failed",
     "info_stage_title": "Stage",
-    "info_stage_msg": "Executed git add -A",
+    "info_stage_msg": "Executed git_feature add -A",
     "err_commit": "Commit failed",
     "info_commit_title": "Commit",
     "info_commit_msg": "Commit created",

{je_editor-0.0.212 → je_editor-0.0.214}/je_editor/utils/multi_language/traditional_chinese.py

@@ -163,7 +163,7 @@ traditional_chinese_word_dict = {
     "err_read_diff": "讀取差異失敗",
     "err_stage": "暫存失敗",
     "info_stage_title": "暫存",
-    "info_stage_msg": "已執行 git add -A",
+    "info_stage_msg": "已執行 git_feature add -A",
     "err_commit": "提交失敗",
     "info_commit_title": "提交",
     "info_commit_msg": "已建立提交",

{je_editor-0.0.212 → je_editor-0.0.214}/je_editor.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: je_editor
-Version: 0.0.212
+Version: 0.0.214
 Summary: JEditor is basic but powerful editor include GPT
 Author-email: JE-Chen <jechenmailman@gmail.com>
 Project-URL: Homepage, https://github.com/JE-Chen/je_editor

{je_editor-0.0.212 → je_editor-0.0.214}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "je_editor"
-version = "0.0.212"
+version = "0.0.214"
 authors = [
     { name = "JE-Chen", email = "jechenmailman@gmail.com" },
 ]