Merge pull request 'develop' (#3) from develop into master

Reviewed-on: #3

plugins/code/commands/file_history/plugin.py

@@ -25,7 +25,7 @@ class Plugin(PluginCode):
             if len(history) == history_size:
                 history.pop(0)
 
-            history.append(event.file.fpath)
+            history.append(event.file)
 
     def load(self):
         self._manage_signals("register_command")
@@ -60,6 +60,6 @@ class Handler:
 
         view._on_uri_data_received(
             [
-                f"file://{history.pop()}"
+                history.pop().replace("file://", "")
             ]
         )

plugins/code/commands/nanoesq_temp_buffer/plugin.py

@@ -23,7 +23,7 @@ class Plugin(PluginCode):
     def load(self):
         self._manage_signals("register_command")
 
-    def unload(self):
+    def load(self):
         self._manage_signals("unregister_command")
 
     def _manage_signals(self, action: str):

plugins/code/ui/tabs_bar/plugin.py

@@ -1,9 +1,6 @@
 # Python imports
 
 # Lib imports
-import gi
-
-from gi.repository import Gtk
 
 # Application imports
 from libs.event_factory import Event_Factory, Code_Event_Types
@@ -28,19 +25,8 @@ class Plugin(PluginCode):
 
         self.register_controller("tabs", self.tabs_controller)
 
-        scrolled_win = Gtk.ScrolledWindow()
-        viewport     = Gtk.Viewport()
-
-        scrolled_win.set_overlay_scrolling(False)
-        scrolled_win.set_size_request(-1, 50)
-
-        viewport.add( self.tabs_controller.tabs_widget )
-        scrolled_win.add( viewport )
-        code_container.add( scrolled_win )
-        code_container.reorder_child(scrolled_win, 0)
-
-        viewport.show()
-        scrolled_win.show()
+        code_container.add( self.tabs_controller.tabs_widget )
+        code_container.reorder_child(self.tabs_controller.tabs_widget, 0)
 
         event = Event_Factory.create_event("get_files")
         self.emit_to("files", event)
@@ -50,14 +36,7 @@ class Plugin(PluginCode):
     def unload(self):
         self.unregister_controller("tabs")
         self.tabs_controller.unload_tabs()
-
-        tabs_widget  = self.tabs_controller.tabs_widget
-        viewport     = tabs_widget.get_parent()
-        scrolled_win = viewport.get_parent()
-
-        tabs_widget.destroy()
-        viewport.destroy()
-        scrolled_win.destroy()
+        self.tabs_controller.tabs_widget.destroy()
 
         self.tabs_controller.tabs_widget = None
         self.tabs_controller             = None

plugins/code/ui/tabs_bar/tabs_widget.py

@@ -27,7 +27,7 @@ class TabsWidget(Gtk.Notebook):
 
 
     def _setup_styling(self):
-        ...
+        self.set_scrollable(True)
 
     def _setup_signals(self):
         self.connect("page-added", self._page_added)
@@ -67,7 +67,6 @@ class TabsWidget(Gtk.Notebook):
         )
 
         self.emit(event)
-        self._scroll_to_center(tab)
 
     def _bind_tab_menu(self, tab, page_widget):
         def do_context_menu(tab, eve, page_widget):
@@ -82,21 +81,6 @@ class TabsWidget(Gtk.Notebook):
                 page_widget
             )
 
-    def _scroll_to_center(self, tab):
-        scrolled_win = self.get_parent().get_parent()
-        alloc        = tab.get_allocation()
-        tab_x        = alloc.x
-        tab_width    = alloc.width
-        view_width   = scrolled_win.get_allocated_width()
-        target       = tab_x + tab_width / 2 - view_width / 2
-        adj          = scrolled_win.get_hadjustment()
-        lower        = adj.get_lower()
-        upper        = adj.get_upper()
-        page_size    = adj.get_page_size()
-        target       = max(lower, min(target, upper - page_size))
-
-        adj.set_value(target)
-
     def create_menu(self, page_widget) -> Gtk.Menu:
         context_menu  = Gtk.Menu()
         close_submenu = Gtk.Menu()
@@ -146,7 +130,6 @@ class TabsWidget(Gtk.Notebook):
                 self.page_num(page_widget)
             )
             self.handler_unblock(self.switch_page_id)
-            self._scroll_to_center(tab)
 
             break
 

src/plugins/manifest_manager.py

@@ -56,7 +56,7 @@ class ManifestManager:
 
             if not manifest.autoload:
                 self.manual_launch_manifests.append(manifest_meta)
-                return manifest_meta
+                return
 
             if manifest.pre_launch:
                 self.pre_launch_manifests.append(manifest_meta)

src/plugins/plugin_reload_mixin.py

@@ -48,14 +48,14 @@ class PluginReloadMixin:
 
     def remove_plugin(self, file: str) -> None:
         logger.info(f"Removing plugin: {file.get_uri()}")
-
-        manifests = self._manifest_manager.pre_launch_manifests    \
-                    + self._manifest_manager.post_launch_manifests \
-                    + self._manifest_manager.manual_launch_manifests
-
-        for manifest_meta in manifests:
+        for manifest_meta in self._plugin_collection[:]:
             if not manifest_meta.folder in file.get_uri(): continue
 
+            manifest_meta.instance.unload()
+            manifest_meta.instance = None
+            self._plugin_collection.remove(manifest_meta)
+            self.plugins_ui.remove_row(manifest_meta)
+
             if manifest_meta in self._manifest_manager.pre_launch_manifests:
                 self._manifest_manager.pre_launch_manifests.remove(manifest_meta)
             elif manifest_meta in self._manifest_manager.post_launch_manifests:
@@ -63,15 +63,4 @@ class PluginReloadMixin:
             elif manifest_meta in self._manifest_manager.manual_launch_manifests:
                 self._manifest_manager.manual_launch_manifests.remove(manifest_meta)
 
-            self.plugins_ui.remove_row(manifest_meta)
-            break
-
-        del manifests
-        for manifest_meta in self._plugin_collection[:]:
-            if not manifest_meta.folder in file.get_uri(): continue
-
-            manifest_meta.instance.unload()
-            manifest_meta.instance = None
-            self._plugin_collection.remove(manifest_meta)
-
             break

src/plugins/plugins_ui.py

@@ -76,7 +76,6 @@ class PluginsUI(Gtk.Dialog):
 
         toggle_bttn.toggle_id = \
             toggle_bttn.connect("toggled", callback, manifest_meta)
-        box.toggle_bttn = toggle_bttn
 
         box.add(plugin_lbl)
         box.add(author_lbl)
@@ -97,5 +96,5 @@ class PluginsUI(Gtk.Dialog):
             toggle_bttn.disconnect(toggle_bttn.toggle_id)
 
             self.list_box.remove(row)
-            child.destroy()
+            box.destroy()
             break