pyqt-code-editor 0.0.4__tar.gz → 0.0.6__tar.gz

{pyqt_code_editor-0.0.4 → pyqt_code_editor-0.0.6}/PKG-INFO

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

@@ -2,4 +2,4 @@
 
 from ._settings import settings
 
-__version__ = '0.0.4'
+__version__ = '0.0.6'

{pyqt_code_editor-0.0.4 → pyqt_code_editor-0.0.6}/pyqt_code_editor/_settings.py

@@ -57,29 +57,16 @@ class Settings(QObject):
     # Signal emitted when any setting changes: (setting_name, new_value)
     setting_changed = Signal(str, object)
     
-    # Singleton instance
-    _instance = None
-    
-    def __new__(cls):
-        if cls._instance is None:
-            cls._instance = super(Settings, cls).__new__(cls)
-            cls._instance._initialized = False
-        return cls._instance
-    
-    def __init__(self):
-        if self._initialized:
-            return
-        
+    def __init__(self):        
         super().__init__()
         self._values = {}
         self._qsettings = QSettings("cogscinl", "Sigmund Analyst")
-        self._initialized = True
         logger.info("Initializing Settings manager")
         self._load_settings()
     
     # Appearance
     font_size = SettingProperty(16, "Appearance")
-    font_family = SettingProperty('Ubuntu Mono', "Appearance")
+    font_family = SettingProperty('default', "Appearance")
     color_scheme = SettingProperty('monokai', "Appearance")
     tab_width = SettingProperty(4, "Appearance")
     default_indent = SettingProperty('\t', "Appearance")
@@ -227,6 +214,19 @@ class Settings(QObject):
         """Returns all settings as a JSON array of objects."""
         # todo
         return json.dumps({name: value for name, value in self})
+        
+    def set_font_family(self):
+        """Changes the font family from default to an actual font. This happens
+        only after the app has been initialized, because QFontDatase requires
+        a QApplication instance.
+        """
+        if self.font_family != 'default':
+            return
+        from .utils import get_first_available_font
+        self.font_family = get_first_available_font(
+            ['Ubuntu Mono', 'Liberation Mono', 'DejaVu Sans Mono', 'Courier New',
+             'monospace'])
+        logger.info(f'setting font family to {self.font_family}')
 
 
 # Create the singleton instance

{pyqt_code_editor-0.0.4 → pyqt_code_editor-0.0.6}/pyqt_code_editor/app.py

@@ -445,6 +445,7 @@ class MainWindow(QMainWindow):
         
 def launch_app():
     app = QApplication(sys.argv)
+    settings.set_font_family()
     window = MainWindow()
     window.show()
     sys.exit(app.exec_())

{pyqt_code_editor-0.0.4 → pyqt_code_editor-0.0.6}/pyqt_code_editor/components/editor_panel.py

@@ -82,8 +82,13 @@ class EditorPanel(QWidget):
         active_editor.save_file_as()
     
     def select_and_open_file(self):
+        options = QFileDialog.Options()
+        if os.environ.get("DONT_USE_NATIVE_FILE_DIALOG", False):
+            options |= QFileDialog.Option.DontUseNativeDialog
+            logger.info('not using native file dialog')        
         path, _ = QFileDialog.getOpenFileName(
-            self, "Open File", settings.current_folder, "All Files (*.*)")
+            self, "Open File", settings.current_folder, "All Files (*.*)",
+            options=options)
         if path:
             settings.current_folder = os.path.dirname(path)
             self.open_file(path)

{pyqt_code_editor-0.0.4 → pyqt_code_editor-0.0.6}/pyqt_code_editor/components/jupyter_console.py

@@ -17,6 +17,23 @@ from .. import watchdog
 logger = logging.getLogger(__name__)
 
 
+class HomeAwareKernelSpecManager(KernelSpecManager):
+    """Reimplements the KernelSpecManager to always search in the Linux home
+    folder. This for example ensures that the local kernels are picked up in a
+    flatpak environment.
+    """
+    def _kernel_dirs_default(self) -> list[str]:
+        dirs = super()._kernel_dirs_default()
+        home_dir = os.path.expanduser("~")
+        jupyter_kernel_dir = os.path.join(
+            home_dir, '.local', 'share', 'jupyter', 'kernels')
+        if os.path.isdir(jupyter_kernel_dir) and os.access(jupyter_kernel_dir,
+                                                           os.R_OK):
+            if jupyter_kernel_dir not in dirs:
+                dirs.append(jupyter_kernel_dir)
+        return dirs
+
+
 class JupyterConsoleTab(QWidget):
     """Individual tab containing a Jupyter console with its own kernel"""
     
@@ -389,7 +406,7 @@ class JupyterConsole(Dock):
         self.kernel_menu.clear()
         
         # Get available kernelspecs
-        kernel_spec_manager = KernelSpecManager()
+        kernel_spec_manager = HomeAwareKernelSpecManager()
         specs = kernel_spec_manager.get_all_specs()
         
         for spec_name, spec in specs.items():

{pyqt_code_editor-0.0.4 → pyqt_code_editor-0.0.6}/pyqt_code_editor/components/project_explorer.py

@@ -8,7 +8,6 @@ from qtpy.QtWidgets import (
     QFileDialog,
     QMenu,
     QMessageBox,
-    QShortcut,
     QInputDialog,
     QWidget,
     QVBoxLayout,
@@ -249,12 +248,12 @@ class ProjectExplorer(QDockWidget):
         If a folder is selected, a ProjectExplorer instance is created and returned.
         Otherwise None is returned.
         """
-        selected_dir = QFileDialog.getExistingDirectory(
-            parent,
-            "Open Project Folder",
-            "",
-            QFileDialog.ShowDirsOnly
-        )
+        options = QFileDialog.Options(QFileDialog.ShowDirsOnly)
+        if os.environ.get("DONT_USE_NATIVE_FILE_DIALOG", False):
+            options |= QFileDialog.Option.DontUseNativeDialog
+            logger.info('not using native file dialog')        
+        selected_dir = QFileDialog.getExistingDirectory(parent,
+            "Open Project Folder", "", options=options)
         if not selected_dir:
             return None
         settings.current_folder = selected_dir

{pyqt_code_editor-0.0.4 → pyqt_code_editor-0.0.6}/pyqt_code_editor/mixins/file_link.py

@@ -93,10 +93,10 @@ class FileLink:
         self.set_modified(False)
         self.file_saved.emit(self, self.code_editor_encoding)
 
-    def save_file_as(self, path: Path | str =  None):
+    def save_file_as(self, path: Path | str = None):
         """
         Saves the editor content to file and updates code_editor_file_path.
-        If no path is provided, the user asked to choose.
+        If no path is provided, the user is asked to choose.
         """
         if path is None:
             if self.code_editor_file_path is None:
@@ -104,10 +104,18 @@ class FileLink:
                                               settings.default_filename)
             else:
                 suggested_name = self.code_editor_file_path
+
+            options = QFileDialog.Options()
+            if os.environ.get("DONT_USE_NATIVE_FILE_DIALOG", False):
+                options |= QFileDialog.Option.DontUseNativeDialog
+                logger.info('not using native file dialog')
             path, _ = QFileDialog.getSaveFileName(
-                self, "Save As", suggested_name, "All Files (*.*)")
+                self, "Save As", suggested_name, "All Files (*.*)", options=options
+            )
+
             if not path:
                 return
+
         old_path = self.code_editor_encoding
         settings.current_folder = os.path.dirname(path)
         self.code_editor_file_path = str(path)

{pyqt_code_editor-0.0.4 → pyqt_code_editor-0.0.6}/pyqt_code_editor/utils.py

@@ -94,3 +94,15 @@ def shorten_paths(paths):
     
     return results
 
+
+def get_first_available_font(font_candidates):
+    """
+    Takes a list of font family names and returns the first
+    that is available on the system, or None if none are found.
+    """
+    from qtpy.QtGui import QFontDatabase
+    available_families = QFontDatabase.families()
+    for candidate in font_candidates:
+        if candidate in available_families:
+            return candidate
+    return None