pyqt-code-editor 0.0.44__tar.gz → 0.0.46__tar.gz

{pyqt_code_editor-0.0.44 → pyqt_code_editor-0.0.46}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyqt_code_editor
-Version: 0.0.44
+Version: 0.0.46
 Summary: Fully featured code-editor widgets for PyQt
 Keywords: code editor,pyqt,ide
 Author-email: Sebastiaan Mathôt <s.mathot@cogsci.nl>

{pyqt_code_editor-0.0.44 → pyqt_code_editor-0.0.46}/pyqt_code_editor/__init__.py

@@ -2,4 +2,4 @@
 
 from ._settings import settings
 
-__version__ = '0.0.44'
+__version__ = '0.0.46'

{pyqt_code_editor-0.0.44 → pyqt_code_editor-0.0.46}/pyqt_code_editor/mixins/base.py

@@ -38,10 +38,15 @@ class Base:
         self.modified = False
         self.modificationChanged.connect(self.set_modified)
         # Dictionary mapping pid -> result queue
-        self._active_requests = {}        
+        self._active_requests = {}
+        
+    def unload(self):
+        """Can be implemented in other mixin classes to handle unloading logic.
+        """
+        pass
         
     def eventFilter(self, obj, event):
-        """Can be implement in other mixin classes to filter certain events,
+        """Can be implemented in other mixin classes to filter certain events,
         for example to avoid certain keypresses from being consumed.
         """
         return False

{pyqt_code_editor-0.0.44 → pyqt_code_editor-0.0.46}/pyqt_code_editor/mixins/file_link.py

@@ -226,4 +226,10 @@ class FileLink:
             # Re-add the file to watcher so we keep listening for future changes
             if self._file_watcher is not None:
                 self._file_watcher.addPath(changed_path)
-        self._watch_file_changes = True
+        self._watch_file_changes = True
+        
+    def unload(self):
+        if self._file_watcher:
+            self._file_watcher.fileChanged.disconnect(self._on_file_changed)
+        super().unload()
+        

{pyqt_code_editor-0.0.44 → pyqt_code_editor-0.0.46}/pyqt_code_editor/widgets/tabbed_editor.py

@@ -5,6 +5,7 @@ from qtpy.QtWidgets import QTabWidget, QShortcut, QMessageBox, QMenu, QStyle, \
     QApplication, QTabBar
 from qtpy.QtCore import Signal, Qt, QMimeData, QPoint, QByteArray, QDataStream
 from ..code_editors import create_editor
+from ..mixins import Base
 from .. import settings, utils
 from ..signal_router import signal_router
 logger = logging.getLogger(__name__)
@@ -240,7 +241,8 @@ class TabbedEditor(QTabWidget):
             self.setTabText(index, title)
             return
         logger.info(f'language changed from {from_language} to {to_language}')
-        self.removeTab(index)
+        editor.unload()
+        self.removeTab(index)        
         self.add_code_editor(to_path, index=index)
 
     def add_code_editor(self, path=None, index=None):
@@ -332,17 +334,18 @@ class TabbedEditor(QTabWidget):
         dataByteArray = event.mimeData().data("application/x-tabdata")
         stream = QDataStream(dataByteArray, QDataStream.ReadOnly)
         tabText = stream.readQString()
-        # (We ignore the icon detail in this example or simply set a blank icon.)
-        # If you’re handing around pixmaps, you could store them more explicitly.
-
         # The source tab's DraggableTabBar has already removed it from its QTabWidget.
         # But we need the actual widget object that was being dragged. It's part
         # of the QDrag's source — we can find it by casting. We must be careful:
         sourceBar = event.source()
         if isinstance(sourceBar, DraggableTabBar):
-            draggedWidget = sourceBar.draggedWidget
-        else:
-            draggedWidget = None
+            editor = sourceBar.draggedWidget
+        if not isinstance(editor, Base):
+            logger.warning(f'expecting editor, found {editor}')
+            return
+        editor.modification_changed.connect(self._on_modification_changed)
+        editor.file_name_changed.connect(self._on_file_name_changed)
+        logger.info("dropping editor")
 
         # Insert the tab at the position that the user dropped on
         dropPos = event.position().toPoint()
@@ -351,7 +354,7 @@ class TabbedEditor(QTabWidget):
         if index < 0:
             # If the user dropped to the right of all existing tabs
             index = self.count()
-
-        self.insertTab(index, draggedWidget, tabText)
+        
+        self.insertTab(index, editor, tabText)
         self.setCurrentIndex(index)