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

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

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

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

{pyqt_code_editor-0.0.19 → 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.19 → 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.19 → 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.19 → pyqt_code_editor-0.0.21}/pyqt_code_editor/components/find_in_files.py

@@ -2,8 +2,9 @@ import os
 import multiprocessing
 from qtpy.QtWidgets import QDockWidget, QWidget, QVBoxLayout, QHBoxLayout, \
     QLineEdit, QCheckBox, QPushButton, QTreeWidget, QTreeWidgetItem, \
-    QAbstractItemView
+    QAbstractItemView, QLabel
 from qtpy.QtCore import Qt, QTimer, Signal
+import fnmatch
 
 
 def search_in_files_worker(files, search_text, case_sensitive, whole_word, regex, output_queue):
@@ -53,7 +54,8 @@ class FindInFiles(QDockWidget):
         super().__init__("Find in Files", parent)
         self.setAllowedAreas(Qt.LeftDockWidgetArea | Qt.RightDockWidgetArea)
         
-        self._files = files_list[:]  # store a copy
+        self._all_files = files_list[:]  # store all files
+        self._filtered_files = []  # files after extension filter
         self._search_process = None
         self._output_queue = None
         
@@ -83,6 +85,20 @@ class FindInFiles(QDockWidget):
         controls_layout.addWidget(self.searchBtn)
         controls_layout.setContentsMargins(0, 0, 0, 0)
         
+        # File type filter row
+        filter_layout = QHBoxLayout()
+        layout.addLayout(filter_layout)
+        
+        filter_label = QLabel("File types:", self)
+        self.fileTypesInput = QLineEdit(self)
+        self.fileTypesInput.setPlaceholderText("e.g. .py .js .html (default: .*)")
+        self.fileTypesInput.setText(".*")  # Default to all files
+        self.fileTypesInput.setToolTip("Space or comma separated extensions. Use .* for all files.")
+        
+        filter_layout.addWidget(filter_label)
+        filter_layout.addWidget(self.fileTypesInput)
+        filter_layout.setContentsMargins(0, 0, 0, 0)
+        
         # Tree Widget for results
         self.resultsTree = QTreeWidget(self)
         self.resultsTree.setHeaderLabels(["File / Line", "Preview"])
@@ -104,6 +120,41 @@ class FindInFiles(QDockWidget):
         super().showEvent(event)
         self.searchInput.setFocus()        
     
+    def _parse_extensions(self, text):
+        """Parse extension filter text into a list of patterns"""
+        if not text or text.strip() == ".*":
+            return ["*"]  # Match all files
+        
+        # Split by spaces or commas
+        import re
+        extensions = re.split(r'[,\s]+', text.strip())
+        
+        # Convert extensions to glob patterns
+        patterns = []
+        for ext in extensions:
+            if ext:
+                if not ext.startswith('.'):
+                    ext = '.' + ext
+                patterns.append('*' + ext)
+        
+        return patterns if patterns else ["*"]
+    
+    def _filter_files_by_extension(self):
+        """Filter files based on the extension patterns"""
+        patterns = self._parse_extensions(self.fileTypesInput.text())
+        
+        if patterns == ["*"]:
+            # No filtering needed
+            self._filtered_files = self._all_files[:]
+            return
+        
+        self._filtered_files = []
+        for file_path in self._all_files:
+            for pattern in patterns:
+                if fnmatch.fnmatch(os.path.basename(file_path).lower(), pattern.lower()):
+                    self._filtered_files.append(file_path)
+                    break
+    
     def _start_search(self):
         # Kill any existing worker first
         if self._search_process and self._search_process.is_alive():
@@ -112,10 +163,26 @@ class FindInFiles(QDockWidget):
         # Clear old results
         self.resultsTree.clear()
         
+        # Filter files by extension
+        self._filter_files_by_extension()
+        
+        # Show file count in status
+        file_count_item = QTreeWidgetItem(self.resultsTree)
+        file_count_item.setText(0, f"Searching {len(self._filtered_files)} files...")
+        file_count_item.setForeground(0, Qt.gray)
+        
+        # If no files match the filter, show message
+        if not self._filtered_files:
+            self.resultsTree.clear()
+            no_files_item = QTreeWidgetItem(self.resultsTree)
+            no_files_item.setText(0, "No files match the specified extensions")
+            no_files_item.setForeground(0, Qt.gray)
+            return
+        
         # Prepare
         self._output_queue = multiprocessing.Queue()
         args = (
-            self._files,
+            self._filtered_files,
             self.searchInput.text(),
             self.caseBox.isChecked(),
             self.wholeWordBox.isChecked(),
@@ -136,6 +203,7 @@ class FindInFiles(QDockWidget):
                 return
             
             # Grab everything from the queue
+            first_result = True
             while not self._output_queue.empty():
                 msg = self._output_queue.get()
                 if not msg:
@@ -143,6 +211,13 @@ class FindInFiles(QDockWidget):
                 kind = msg[0]
                 
                 if kind == "found":
+                    # Clear the "Searching..." message on first result
+                    if first_result and self.resultsTree.topLevelItemCount() == 1:
+                        first_item = self.resultsTree.topLevelItem(0)
+                        if "Searching" in first_item.text(0):
+                            self.resultsTree.clear()
+                        first_result = False
+                    
                     # we have file + list of (line_num, text)
                     file_path = msg[1]
                     lines = msg[2]
@@ -154,6 +229,15 @@ class FindInFiles(QDockWidget):
                 elif kind == "done":
                     # done means the worker finished scanning
                     self._search_process = None
+                    
+                    # If no results found, show message
+                    if self.resultsTree.topLevelItemCount() == 1:
+                        first_item = self.resultsTree.topLevelItem(0)
+                        if "Searching" in first_item.text(0):
+                            self.resultsTree.clear()
+                            no_results_item = QTreeWidgetItem(self.resultsTree)
+                            no_results_item.setText(0, "No matches found")
+                            no_results_item.setForeground(0, Qt.gray)
     
     def _add_file_matches(self, file_path, lines):
         # Create a top-level item for file

{pyqt_code_editor-0.0.19 → 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.19 → pyqt_code_editor-0.0.21}/pyqt_code_editor/mixins/base.py

@@ -15,6 +15,7 @@ class Base:
     code_editor_language = 'text'
     modification_changed = Signal(object, bool)
     received_focus = Signal(object)
+    lost_focus = Signal(object)
     
     def __init__(self, *args, **kwargs):
         # Optionally set the language. This is mainly for generic editors that
@@ -52,6 +53,13 @@ class Base:
         """
         super().focusInEvent(event)
         self.received_focus.emit(self)
+        
+    def focusOutEvent(self, event):
+        """Allows managing widgets, such as the editor panel, to keep track of
+        which editor is active
+        """
+        super().focusOutEvent(event)
+        self.lost_focus.emit(self)        
     
     def refresh(self):
         """Can be called to indicate that the interface needs to be refreshed,

{pyqt_code_editor-0.0.19 → 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."""

{pyqt_code_editor-0.0.19 → pyqt_code_editor-0.0.21}/pyqt_code_editor/mixins/complete.py

@@ -99,7 +99,7 @@ class Complete:
         self._cm_completion_popup.hide()
         
     def focusOutEvent(self, event):
-        """Make sure the calltip doesn't stay open when we scroll the viewport.
+        """Make sure the calltip doesn't stay open when the widget loses focus.
         """
         super().focusOutEvent(event)
         self._cm_hide_calltip()
@@ -516,9 +516,7 @@ class Complete:
             global_pos = global_bottom_left
             logger.info("Positioning calltip below cursor.")
     
-        print(f'intended position: {global_pos}')
         self._cm_calltip_widget.move(global_pos)
-        print(f'actual position: {self._cm_calltip_widget.pos()}')
         self._cm_calltip_widget.show()
 
     def closeEvent(self, event):

{pyqt_code_editor-0.0.19 → pyqt_code_editor-0.0.21}/pyqt_code_editor/mixins/line_number.py

@@ -50,6 +50,8 @@ class LineNumber:
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
+        self._line_number_rects = {}
+        self._line_rects = {}
         self.setMouseTracking(True)
         # Create the line number area
         self.lineNumberArea = LineNumberArea(self)

{pyqt_code_editor-0.0.19 → pyqt_code_editor-0.0.21}/pyqt_code_editor/widgets/quick_open_dialog.py

@@ -1,4 +1,3 @@
-import os
 import logging
 from qtpy.QtWidgets import (
     QDialog,
@@ -10,6 +9,7 @@ from qtpy.QtWidgets import (
 )
 from qtpy.QtCore import Qt, QSortFilterProxyModel, QModelIndex
 from qtpy.QtGui import QStandardItemModel, QStandardItem
+from .. import settings, themes
 
 logger = logging.getLogger(__name__)
 
@@ -42,6 +42,26 @@ class MultiNeedleFilterProxyModel(QSortFilterProxyModel):
             if needle not in item_text_lower:
                 return False
         return True
+        
+STYLESHEET = '''
+QuickOpenDialog {{
+    background-color: {background};
+    color: {foreground};
+    padding: 8px;
+    border-radius: 4px;
+}}
+QLineEdit {{
+    margin-bottom: 4px;
+}}
+QLineEdit, QListView {{
+    color: {foreground};
+    border: none;
+    font-family: {font_family};
+    font-size: {font_size}px;
+    background-color: {selection_background};
+    padding: 4px;
+}}
+'''
 
 class QuickOpenDialog(QDialog):
     """
@@ -52,11 +72,20 @@ class QuickOpenDialog(QDialog):
     """
     def __init__(self, parent, items, title="Quick Open"):
         super().__init__(parent)
+        color_scheme = themes.THEMES.get(settings.color_scheme)
+        if color_scheme:            
+            self.setStyleSheet(STYLESHEET.format(
+                background=color_scheme['background_color'],
+                foreground=color_scheme['text_color'],
+                selection_background=color_scheme['selection_background'],
+                font_size=settings.font_size,
+                font_family=settings.font_family
+            ))
         self.setWindowFlags(Qt.Dialog | Qt.FramelessWindowHint)
         self.setWindowModality(Qt.ApplicationModal)
 
         self.setWindowTitle(title)
-        self.resize(400, 400)
+        self.resize(800, 400)
 
         layout = QVBoxLayout(self)
         self._filter_edit = QLineEdit(self)
@@ -65,6 +94,10 @@ class QuickOpenDialog(QDialog):
 
         self._list_view = QListView(self)
         self._list_view.setSelectionMode(QAbstractItemView.SingleSelection)
+        self._list_view.setVerticalScrollBarPolicy(Qt.ScrollBarAlwaysOff)
+        self._list_view.setHorizontalScrollBarPolicy(Qt.ScrollBarAlwaysOff)
+        self._list_view.setTextElideMode(Qt.ElideMiddle)
+        
         layout.addWidget(self._list_view)
 
         self._items = items