diff --git a/home/abaddon/.config/newton/lsps/ropeproject/autoimport.db b/home/abaddon/.config/newton/lsps/ropeproject/autoimport.db new file mode 100644 index 0000000..15dbd79 Binary files /dev/null and b/home/abaddon/.config/newton/lsps/ropeproject/autoimport.db differ diff --git a/plugins/code/commands/split_pane/create_split_view.py b/plugins/code/commands/split_pane/create_split_view.py index c781ef0..fd80524 100644 --- a/plugins/code/commands/split_pane/create_split_view.py +++ b/plugins/code/commands/split_pane/create_split_view.py @@ -47,6 +47,8 @@ def execute( pane.set_hexpand(True) pane.set_vexpand(True) + scrolled_win1.set_hexpand(True) + scrolled_win2.set_vexpand(True) pane.set_wide_handle(True) container.remove(scrolled_win1) @@ -54,21 +56,9 @@ def execute( pane.pack2( scrolled_win2, True, True ) container.add(pane) - def _show(pane, alloc, is_vertical: bool): - if is_vertical: - pane.set_position(alloc.width / 2) - else: - pane.set_position(alloc.height / 2) - - pane.disconnect(pane.show_id) - - is_control, is_shift, is_alt = modkeys_states - alloc = container.get_allocation() if char_str == "|": - pane.show_id = pane.connect("show", _show, alloc, True) pane.set_orientation(Gtk.Orientation.VERTICAL) elif char_str == "\\": - pane.show_id = pane.connect("show", _show, alloc, False) pane.set_orientation(Gtk.Orientation.HORIZONTAL) pane.show_all() diff --git a/src/__main__.py b/src/__main__.py index b30240b..b496871 100644 --- a/src/__main__.py +++ b/src/__main__.py @@ -4,12 +4,12 @@ import argparse import faulthandler import traceback -from setproctitle import setproctitle import tracemalloc tracemalloc.start() # Lib imports +from setproctitle import setproctitle # Application imports from __builtins__ import * diff --git a/src/core/controllers/base_controller.py b/src/core/controllers/base_controller.py index 28e985e..3b92f57 100644 --- a/src/core/controllers/base_controller.py +++ b/src/core/controllers/base_controller.py @@ -81,7 +81,7 @@ class BaseController(IPCSignalsMixin, KeyboardSignalsMixin, BaseControllerMixin) def _load_files(self): for file in settings_manager.get_starting_files(): - event_system.emit("post-file-to-ipc", file) + event_system.emit("post-file-to-ipc", f"FILE|{file}") def _tggl_top_main_menubar(self): logger.debug("_tggl_top_main_menubar > stub...") diff --git a/src/core/widgets/code/controllers/completion_controller.py b/src/core/widgets/code/controllers/completion_controller.py index f714511..2f478d5 100644 --- a/src/core/widgets/code/controllers/completion_controller.py +++ b/src/core/widgets/code/controllers/completion_controller.py @@ -4,7 +4,6 @@ import gi gi.require_version('GtkSource', '4') -from gi.repository import GLib from gi.repository import GtkSource # Application imports diff --git a/src/core/widgets/vte_widget.py b/src/core/widgets/vte_widget.py index 888c75d..6fbde45 100644 --- a/src/core/widgets/vte_widget.py +++ b/src/core/widgets/vte_widget.py @@ -88,7 +88,7 @@ class VteWidget(Vte.Terminal): self.spawn_async( Vte.PtyFlags.DEFAULT, settings_manager.path_manager.get_home_path(), - ["/bin/bash"], + ["/bin/bash", "--rcfile", f"{settings_manager.path_manager.get_home_path()}/.bashrc", "-i"], env, GLib.SpawnFlags.DEFAULT, None, None, -1, None, None, diff --git a/src/core/widgets/webkit/webkit_ui.py b/src/core/widgets/webkit/webkit_ui.py index 69d7faf..4f52bd9 100644 --- a/src/core/widgets/webkit/webkit_ui.py +++ b/src/core/widgets/webkit/webkit_ui.py @@ -5,7 +5,7 @@ import json # Lib imports import gi gi.require_version('Gdk', '3.0') -gi.require_version('WebKit2', '4.0') +gi.require_version('WebKit2', '4.1') from gi.repository import Gdk from gi.repository import Gtk from gi.repository import Gio diff --git a/src/libs/event_factory.py b/src/libs/event_factory.py index e8ccc43..5dc1e93 100644 --- a/src/libs/event_factory.py +++ b/src/libs/event_factory.py @@ -31,7 +31,7 @@ class EventFactory(Singleton): event_type = self._class_name_to_event_type(name) self._event_classes[event_type] = obj - Code_Event_Types.add_event_class(name, obj) + App_Event_Types.add_event_class(name, obj) i += 1 logger.debug(f"Registered {i} event types:") @@ -44,7 +44,7 @@ class EventFactory(Singleton): event_type = self._class_name_to_event_type(name) del self._event_classes[event_type] - Code_Event_Types.remove_event_class(name) + App_Event_Types.remove_event_class(name) i += 1 logger.debug(f"Unregistered {i} event types:") @@ -98,6 +98,7 @@ class EventNamespace: -Code_Event_Types = EventNamespace() +App_Event_Types = EventNamespace() +Code_Event_Types = App_Event_Types Event_Factory = EventFactory() diff --git a/src/libs/settings/options/config.py b/src/libs/settings/options/config.py index 729d8ac..e85a32e 100644 --- a/src/libs/settings/options/config.py +++ b/src/libs/settings/options/config.py @@ -35,5 +35,5 @@ class Config: main_window_height: int = 600 application_dirs: list = field(default_factory=lambda: [ "/usr/share/applications", - f"{settings_manager.get_home_path()}/.local/share/applications" + f"{settings_manager.path_manager.get_home_path()}/.local/share/applications" ]) diff --git a/src/libs/settings/path_manager.py b/src/libs/settings/path_manager.py index 59217e4..8f80c6e 100644 --- a/src/libs/settings/path_manager.py +++ b/src/libs/settings/path_manager.py @@ -88,6 +88,7 @@ class PathManager: def get_ui_widgets_path(self) -> str: return self._UI_WIDGETS_PATH def get_context_path(self) -> str: return self._CONTEXT_PATH def get_plugins_path(self) -> str: return self._PLUGINS_PATH + def get_icons_path(self) -> str: return self._DEFAULT_ICONS def get_css_file(self) -> str: return self._CSS_FILE def get_home_config_path(self) -> str: return self._HOME_CONFIG_PATH def get_window_icon(self) -> str: return self._WINDOW_ICON diff --git a/src/libs/settings/webkit/webkit_ui_settings.py b/src/libs/settings/webkit/webkit_ui_settings.py index 0351fc6..ae03366 100644 --- a/src/libs/settings/webkit/webkit_ui_settings.py +++ b/src/libs/settings/webkit/webkit_ui_settings.py @@ -2,7 +2,7 @@ # Lib imports import gi -gi.require_version('WebKit2', '4.0') +gi.require_version('WebKit2', '4.1') from gi.repository import WebKit2 # Application imports diff --git a/src/libs/widget_registery.py b/src/libs/widget_registery.py index 347d056..fe8b3ce 100644 --- a/src/libs/widget_registery.py +++ b/src/libs/widget_registery.py @@ -30,6 +30,7 @@ class WidgetRegisteryController(ControllerBase): widgets = self._builder.get_objects() for widget in widgets: + if not hasattr(widget, "get_name"): continue self.builder_keys.append( widget.get_name() ) def _controller_message(self, event: BaseEvent): diff --git a/src/plugins/controller.py b/src/plugins/controller.py index 6b327fc..40431db 100644 --- a/src/plugins/controller.py +++ b/src/plugins/controller.py @@ -13,7 +13,7 @@ from gi.repository import Gtk from gi.repository import GLib # Application imports -from libs.event_factory import Event_Factory, Code_Event_Types +from libs.event_factory import Event_Factory, App_Event_Types, Code_Event_Types from libs.controllers.controller_base import ControllerBase from libs.dto.plugins.manifest_meta import ManifestMeta from libs.dto.base_event import BaseEvent @@ -58,7 +58,7 @@ class PluginsController(ControllerBase, PluginsControllerMixin, PluginReloadMixi item = Gtk.MenuItem(label = "Plugins") item.connect("activate", self.toggle_plugins_ui) event.menu.append(item) - elif isinstance(event, Code_Event_Types.TogglePluginsUiEvent): + elif isinstance(event, App_Event_Types.TogglePluginsUiEvent): self.toggle_plugins_ui() def _collect_search_locations(self, path: str, locations: list):