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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyqt_code_editor
-Version: 0.0.46
+Version: 0.0.48
 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.46 → pyqt_code_editor-0.0.48}/pyqt_code_editor/__init__.py

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

{pyqt_code_editor-0.0.46 → pyqt_code_editor-0.0.48}/pyqt_code_editor/app.py

@@ -37,6 +37,7 @@ class SigmundAnalyst(QMainWindow):
         # The editor panel provides splittable editor tabs
         self._editor_panel = EditorPanel()
         self._editor_panel.open_folder_requested.connect(self._open_folder)
+        self._editor_panel.open_file_requested.connect(self._open_file)
         self.setCentralWidget(self._editor_panel)
         self._project_explorers = []
         # Track if project explorers are hidden as a group
@@ -407,6 +408,9 @@ class SigmundAnalyst(QMainWindow):
             self._project_explorers_hidden = False
             for explorer in self._project_explorers:
                 explorer.setVisible(True)
+                
+    def _open_file(self, path):
+        self._editor_panel.open_file(path)
 
     def closeEvent(self, event):
         # Check if there are unsaved changes, and ask for confirmation if there

{pyqt_code_editor-0.0.46 → pyqt_code_editor-0.0.48}/pyqt_code_editor/components/editor_panel.py

@@ -11,6 +11,7 @@ logger = logging.getLogger(__name__)
 class EditorPanel(QWidget):
     
     open_folder_requested = Signal(str)
+    open_file_requested = Signal(str)
     
     def __init__(self, parent=None, initial_path=None):
         super().__init__(parent)
@@ -58,6 +59,7 @@ class EditorPanel(QWidget):
         t.lastTabClosed.connect(self.handle_tabbed_editor_empty)
         t.tabCloseRequested.connect(self._relabel_tabs)
         t.open_folder_requested.connect(self.open_folder_requested)
+        t.open_file_requested.connect(self.open_file_requested)
         return t
     
     def unsaved_changes(self):
@@ -92,7 +94,7 @@ class EditorPanel(QWidget):
             settings.current_folder = os.path.dirname(path)
             self.open_file(path)
             
-    def _keep_track_of_active_editor(self, editor):
+    def _keep_track_of_active_editor(self, editor):        
         logger.info(f"active editor = {editor}")
         self._active_editor = editor
         self._active_tab_widget = self._active_editor.parent().parent()
@@ -226,8 +228,14 @@ class EditorPanel(QWidget):
         return find_first_tab_widget(self)
     
     def active_editor(self):
-        if self._active_editor and self._active_editor.isVisible():
-            return self._active_editor
+        try:
+            if self._active_editor and self._active_editor.isVisible():
+                return self._active_editor
+        except RuntimeError:
+            # This may happen when an editor has been closed, causing Qt to
+            # delete it, while the _active_editor property hasn't been properly
+            # updated.
+            pass
         active_tab_widget = self.active_tab_widget()
         if active_tab_widget is None:
             return None

{pyqt_code_editor-0.0.46 → pyqt_code_editor-0.0.48}/pyqt_code_editor/components/settings_panel.py

@@ -104,7 +104,7 @@ class SettingsWidget(QWidget):
             
         elif isinstance(value, int):
             widget = QSpinBox()
-            widget.setRange(-9999, 9999)  # Reasonable default range
+            widget.setRange(int(-1e9), int(1e9))  # Reasonable default range
             widget.setValue(value)
             widget.valueChanged.connect(lambda val, name=setting_name: 
                                        self.update_setting(name, val))

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

@@ -50,6 +50,13 @@ class Base:
         for example to avoid certain keypresses from being consumed.
         """
         return False
+        
+    def setFocus(self):
+        """Allows managing widgets, such as the editor panel, to keep track of
+        which editor is active
+        """
+        super().setFocus()
+        self.received_focus.emit(self)
 
     def focusInEvent(self, event):
         """Allows managing widgets, such as the editor panel, to keep track of

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

@@ -42,29 +42,30 @@ class FileLink:
         # Check file size
         file_size = path.stat().st_size
         is_large = file_size > settings.max_file_size
-        
-        raw_data = path.read_bytes()
         encoding_unknown = False
 
-        if encoding is None:
-            # First see if everything is within ASCII range
-            try:
-                raw_data.decode("utf-8")
-                # If no error -> it's strictly ASCII, so decode as UTF-8
-                used_encoding = "utf-8"
-            except UnicodeDecodeError:
-                # Not pure ASCII; let chardet pick
-                detect_result = chardet.detect(raw_data)
-                # If detection fails or returns None, or confidence is low
-                if (detect_result is None or 
-                    detect_result.get("encoding") is None or
-                    detect_result.get("confidence", 0) < 0.7):
+        if not is_large:
+            raw_data = path.read_bytes()
+    
+            if encoding is None:
+                # First see if everything is within ASCII range
+                try:
+                    raw_data.decode("utf-8")
+                    # If no error -> it's strictly ASCII, so decode as UTF-8
                     used_encoding = "utf-8"
-                    encoding_unknown = True
-                else:
-                    used_encoding = detect_result["encoding"]
-        else:
-            used_encoding = encoding
+                except UnicodeDecodeError:
+                    # Not pure ASCII; let chardet pick
+                    detect_result = chardet.detect(raw_data)
+                    # If detection fails or returns None, or confidence is low
+                    if (detect_result is None or 
+                        detect_result.get("encoding") is None or
+                        detect_result.get("confidence", 0) < 0.7):
+                        used_encoding = "utf-8"
+                        encoding_unknown = True
+                    else:
+                        used_encoding = detect_result["encoding"]
+            else:
+                used_encoding = encoding
             
         # Show warning if file is large or encoding is uncertain
         if is_large or encoding_unknown:

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

@@ -111,6 +111,7 @@ class TabbedEditor(QTabWidget):
     """A tab widget that can hold multiple CodeEditor instances."""
     lastTabClosed = Signal(QTabWidget)
     open_folder_requested = Signal(str)
+    open_file_requested = Signal(str)
     
     def __init__(self, parent=None):
         super().__init__(parent)
@@ -312,6 +313,14 @@ class TabbedEditor(QTabWidget):
             event.ignore()
 
     def dropEvent(self, event):
+        # Insert the tab at the position that the user dropped on
+        dropPos = event.position().toPoint()
+        tabBar = self.tabBar()
+        index = tabBar.tabAt(dropPos)
+        if index < 0:
+            # If the user dropped to the right of all existing tabs
+            index = self.count()        
+        logger.info(f'dropping on tab index {index}')        
         # If a file is dropped, open it in a new tab
         if event.mimeData().hasUrls():
             for url in event.mimeData().urls():
@@ -321,7 +330,10 @@ class TabbedEditor(QTabWidget):
                 if os.path.isdir(path):
                     self.open_folder_requested.emit(path)
                 else:
-                    self.add_code_editor(path)
+                    # Change the focus to the widget that is dopped to make
+                    # sure the file is opened in the right panel
+                    self.widget(min(self.count() - 1, index)).setFocus()
+                    self.open_file_requested.emit(path)
         
         if not event.mimeData().hasFormat("application/x-tabdata"):
             event.ignore()
@@ -346,14 +358,6 @@ class TabbedEditor(QTabWidget):
         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()
-        tabBar = self.tabBar()
-        index = tabBar.tabAt(dropPos)
-        if index < 0:
-            # If the user dropped to the right of all existing tabs
-            index = self.count()
         
         self.insertTab(index, editor, tabText)
         self.setCurrentIndex(index)