pyqt-code-editor 0.0.20__tar.gz → 0.0.21__tar.gz

{pyqt_code_editor-0.0.20 → pyqt_code_editor-0.0.21}/PKG-INFO

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

@@ -2,4 +2,4 @@
 
 from ._settings import settings
 
-__version__ = '0.0.20'
+__version__ = '0.0.21'

{pyqt_code_editor-0.0.20 → pyqt_code_editor-0.0.21}/pyqt_code_editor/_settings.py

@@ -80,6 +80,7 @@ class Settings(QObject):
     
     # Files and Folders
     current_folder = SettingProperty(os.path.expanduser('~'), "Files")
+    project_folders = SettingProperty(os.path.expanduser('~'), "Files")
     default_filename = SettingProperty('untitled.txt', "Files")
     default_language = SettingProperty('python', "Files")
     default_encoding = SettingProperty('utf-8', "Files")

{pyqt_code_editor-0.0.20 → pyqt_code_editor-0.0.21}/pyqt_code_editor/app.py

@@ -26,9 +26,8 @@ class MainWindow(QMainWindow):
         super().__init__()
         logger.info("MainWindow initialized")
         # If no path is provided, fall back to current dir
-        if not root_path:
-            root_path = settings.current_folder
-
+        if root_path:
+            settings.project_folders = settings.current_folder = root_path
         self.setWindowTitle(f"Sigmund Analyst {__version__}")
         # The editor panel provides splittable editor tabs
         self._editor_panel = EditorPanel()
@@ -38,8 +37,9 @@ class MainWindow(QMainWindow):
         # Track if project explorers are hidden as a group
         self._project_explorers_hidden = False
         # Open initial project explorer
-        self._open_project_explorer(root_path)
-
+        for project_folder in str(settings.project_folders).split(':'):
+            if project_folder:
+                self._open_project_explorer(project_folder)
         # Set up the workspace explorer
         self._workspace_explorer = WorkspaceExplorer(parent=self)
         self.addDockWidget(Qt.RightDockWidgetArea, self._workspace_explorer)

{pyqt_code_editor-0.0.20 → pyqt_code_editor-0.0.21}/pyqt_code_editor/code_editors/languages/python.py

@@ -6,7 +6,7 @@ from pyqt_code_editor.mixins import Complete, PythonAutoIndent, \
 
 
 class Editor(LineNumber, Zoom, SmartBackspaceDelete, PythonAutoPair, Complete,
-             PythonAutoIndent, Comment, SearchReplace, FileLink, Execute,
+             Comment, PythonAutoIndent, SearchReplace, FileLink, Execute,
              Theme, Check, Shortcuts, Symbols, Base,
              QPlainTextEdit):
                  

{pyqt_code_editor-0.0.20 → pyqt_code_editor-0.0.21}/pyqt_code_editor/components/project_explorer.py

@@ -262,8 +262,12 @@ class ProjectExplorer(QDockWidget):
         if not selected_dir:
             return None
         settings.current_folder = selected_dir
+        # Add selected folder to project folders but make sure we don't 
+        # duplicate
+        settings.project_folders = ':'.join(
+            set(str(settings.project_folders).split(':')) | {selected_dir})
         explorer = cls(editor_panel, root_path=selected_dir, parent=parent)
-        return explorer        
+        return explorer
         
     def _toggle_gitignore(self, enabled):
         """Toggles the .gitignore filter on or off and refreshes the model.
@@ -514,6 +518,10 @@ class ProjectExplorer(QDockWidget):
         self._clipboard_operation = None
         self._clipboard_source_path = None
         
-    def closeEvent(self, event):
+    def closeEvent(self, event):        
+        # Add selected folder to project folders but make sure we don't 
+        # duplicate
+        settings.project_folders = ':'.join(
+            set(str(settings.project_folders).split(':')) - {self._display_root})
         super().closeEvent(event)
         self.closed.emit(self)

{pyqt_code_editor-0.0.20 → pyqt_code_editor-0.0.21}/pyqt_code_editor/mixins/comment.py

@@ -17,12 +17,31 @@ class Comment:
                                (default "# " for Python).
         """
         super().__init__(*args, **kwargs)
-        # The text to prepend for a commented line
-        self.code_editor_comment_string
         self._comment_shortcut = QShortcut(
             QKeySequence(settings.shortcut_comment), self)
         self._comment_shortcut.setContext(Qt.WidgetWithChildrenShortcut)
         self._comment_shortcut.activated.connect(self._toggle_comment)
+        
+    def keyPressEvent(self, event):
+        # When a return is pressed on a commented line, the comment should
+        # continue on the next line
+        if event.key() in (Qt.Key_Enter, Qt.Key_Return):
+            cursor = self.textCursor()
+            block = cursor.block()
+            line_text = block.text()            
+            # Check if the current line is a comment
+            stripped = line_text.lstrip()
+            if stripped.startswith(self.code_editor_comment_string[0]):
+                # Extract the indentation from the current line
+                indentation = line_text[:len(line_text) - len(stripped)]                
+                # Insert newline with same indentation plus comment marker
+                cursor.beginEditBlock()
+                cursor.insertText(
+                    '\n' + indentation + self.code_editor_comment_string)
+                cursor.endEditBlock()
+                event.accept()
+                return
+        super().keyPressEvent(event)    
 
     def _toggle_comment(self):
         """Toggle comment on the current selection or current line."""