Created libs.code package and moved pertinant DTOs to it as well as widget.code that can go there too

src/core/widgets/code/code_base.py

@@ -31,11 +31,13 @@ class CodeBase:
         completion_controller   = CompletionController()
         source_views_controller = SourceViewsController()
 
+        # self.controller_manager.register_controller("base", self)
         self.controller_manager.register_controller("files", files_controller)
         self.controller_manager.register_controller("tabs", tabs_controller)
         self.controller_manager.register_controller("commands", commands_controller)
         self.controller_manager.register_controller("completion", completion_controller)
         self.controller_manager.register_controller("source_views", source_views_controller)
+        # self.controller_manager.register_controller("plugins", plugins_controller)
 
     def get_tabs_widget(self):
         return self.controller_manager["tabs"].get_tabs_widget()

src/core/widgets/code/command_system/command_system.py

@@ -3,7 +3,8 @@
 # Lib imports
 
 # Application imports
-from ..event_factory import Event_Factory, Event_Factory_Types
+from libs.code.event_factory import Event_Factory, Event_Factory_Types
+
 from ..source_view import SourceView
 
 from . import commands

src/core/widgets/code/controllers/commands_controller.py

@@ -3,11 +3,12 @@
 # Lib imports
 
 # Application imports
-from ..event_factory import Event_Factory_Types
+from libs.code.event_factory import Event_Factory_Types
+
+from libs.code.controllers.controller_base import ControllerBase
 
 from ..command_system import CommandSystem
 
-from .foundation.controller_base import ControllerBase
 
 
 

src/core/widgets/code/controllers/completion_controller.py

@@ -8,13 +8,12 @@ from gi.repository import GLib
 from gi.repository import GtkSource
 
 # Application imports
-from ..event_factory import Event_Factory, Event_Factory_Types
+from libs.code.event_factory import Event_Factory, Event_Factory_Types
+from libs.code.controllers.controller_base import ControllerBase
 
 from ..completion_providers.example_completion_provider import ExampleCompletionProvider
 from ..completion_providers.lsp_completion_provider import LSPCompletionProvider
 
-from .foundation.controller_base import ControllerBase
-
 
 
 class CompletionController(ControllerBase):

src/core/widgets/code/controllers/controller_manager.py

@@ -5,10 +5,10 @@
 # Application imports
 from libs.singleton import Singleton
 
-from ..event_factory import Event_Factory_Types
+from libs.code.event_factory import Event_Factory_Types
 
-from .foundation.controller_base import ControllerBase
+from libs.code.controllers.controller_base import ControllerBase
-from .foundation.controller_context import ControllerContext
+from libs.code.controllers.controller_context import ControllerContext
 
 
 

src/core/widgets/code/controllers/files_controller.py

@@ -3,12 +3,12 @@
 # Lib imports
 
 # Application imports
-from ..event_factory import Event_Factory, Event_Factory_Types
+from libs.code.event_factory import Event_Factory, Event_Factory_Types
+from libs.code.controllers.controller_base import ControllerBase
 
 from ..source_file import SourceFile
 from ..source_buffer import SourceBuffer
 
-from .foundation.controller_base import ControllerBase
 
 
 

src/core/widgets/code/controllers/foundation/__init__.py

@@ -1,3 +0,0 @@
-"""
-    Code Controllers Foundation Package
-"""

src/core/widgets/code/controllers/source_views_controller.py

@@ -3,15 +3,14 @@
 # Lib imports
 
 # Application imports
-from ..event_factory import Event_Factory, Event_Factory_Types
+from libs.code.event_factory import Event_Factory, Event_Factory_Types
+from libs.code.controllers.controller_base import ControllerBase
 
 from ..command_system import CommandSystem
 from ..key_mapper import KeyMapper
 
 from ..source_view import SourceView
 
-from .foundation.controller_base import ControllerBase
-
 
 
 class SourceViewsController(ControllerBase, list):

src/core/widgets/code/controllers/tabs_controller.py

@@ -3,15 +3,14 @@
 # Lib imports
 
 # Application imports
-from ..event_factory import Event_Factory, Event_Factory_Types
+from libs.code.event_factory import Event_Factory, Event_Factory_Types
+from libs.code.controllers.controller_base import ControllerBase
 
 from ..tabs_widget import TabsWidget
 from ..tab_widget import TabWidget
 
 from ..source_view import SourceView
 
-from .foundation.controller_base import ControllerBase
-
 
 
 class TabsController(ControllerBase):

src/core/widgets/code/source_file.py

@@ -12,7 +12,7 @@ from gi.repository import GtkSource
 from gi.repository import Gio
 
 # Application imports
-from .event_factory import Event_Factory, Event_Factory_Types
+from libs.code.event_factory import Event_Factory, Event_Factory_Types
 
 from .source_buffer import SourceBuffer
 

src/core/widgets/code/source_view.py

@@ -9,6 +9,7 @@ from gi.repository import Gtk
 from gi.repository import GLib
 from gi.repository import GtkSource
 
+# Application imports
 from .mixins.source_view_dnd_mixin import SourceViewDnDMixin
 
 

src/core/widgets/code/tabs_widget.py

@@ -6,7 +6,7 @@ gi.require_version('Gtk', '3.0')
 from gi.repository import Gtk
 
 # Application imports
-from .event_factory import Event_Factory_Types
+from libs.code.event_factory import Event_Factory_Types
 
 from .source_view import SourceView
 from .source_file import SourceFile

src/libs/code/__init__.py

@@ -0,0 +1,3 @@
+"""
+    Libs Code Package
+"""

src/libs/code/controllers/__init__.py

@@ -0,0 +1,3 @@
+"""
+    Libs Code Controllers Package
+"""

src/libs/code/controllers/controller_base.py

@@ -5,7 +5,7 @@
 # Application imports
 from libs.singleton import Singleton
 
-from ...event_factory import Event_Factory_Types
+from ..event_factory import Event_Factory_Types
 
 from .emit_dispatcher import EmitDispatcher
 from .controller_context import ControllerContext

src/libs/code/controllers/controller_context.py

@@ -3,7 +3,7 @@
 # Lib imports
 
 # Application imports
-from ...event_factory import Event_Factory_Types
+from ..event_factory import Event_Factory_Types
 
 
 

src/libs/code/controllers/emit_dispatcher.py

@@ -3,7 +3,7 @@
 # Lib imports
 
 # Application imports
-from ...event_factory import Event_Factory_Types
+from ..event_factory import Event_Factory_Types
 
 
 

src/libs/code/dto/__init__.py

@@ -0,0 +1,3 @@
+"""
+    Libs Code DTO(s) Package
+"""

src/libs/code/dto/code/__init__.py

@@ -1,5 +1,5 @@
 """
-    Code DTO Class Package
+    Libs Code DTO(s) Code Package
 """
 
 

src/libs/code/event_factory.py

@@ -6,9 +6,9 @@ import re
 # Lib imports
 
 # Application imports
-from libs.singleton import Singleton
+from ..singleton import Singleton
-from libs.dto.code import CodeEvent
+from .dto.code import CodeEvent
-from libs.dto import code
+from .dto import code
 
 
 

src/libs/db/__init__.py

@@ -1,5 +1,5 @@
 """
-    DB Package
+    Libs DB Package
 """
 
 from .models import User

src/libs/dto/__init__.py

@@ -1,5 +1,5 @@
 """
-    DTO Class Package
+    Libs DTO(s) Package
 """
 
 from .event import Event

src/libs/mixins/__init__.py

@@ -1,3 +1,3 @@
 """
-    Libs.Mixins Package
+    Libs Mixins Package
 """

src/libs/settings/__init__.py

@@ -1,4 +1,4 @@
 """
-    Settings Package
+    Libs Settings Package
 """
 from .manager import SettingsManager