fix: apply editor settings immediately

Author: Lukas Geiger

CHANGELOG.md

@@ -17,6 +17,7 @@ Format basiert auf [Keep a Changelog](https://keepachangelog.com/de/1.1.0/).
 ### Behoben / Fixed
 - Persistenz unbekannter Einstellungsschluessel abgesichert, damit UI-/Legacy-Aliase beim Speichern nicht verloren gehen.
 - Fehlende `chardet`-Abhaengigkeit fuer frische CI-/Installationsumgebungen ergaenzt.
+- Editor-Einstellungen werden nach dem Speichern auf offene Tabs angewendet; der Dialog persistiert jetzt auch „Aktuelle Zeile hervorheben“ und aktualisiert Schrift, Tab-Breite, Zeilennummern und Cursor-Markierung unmittelbar.
 
 ## [1.0.0] - YYYY-MM-DD
 

src/gui/dialogs/settings_dialog.py

@@ -382,6 +382,7 @@ def _load_settings(self):
         self.line_numbers.setChecked(self.settings.get('editor.line_numbers', True))
         self.auto_complete.setChecked(self.settings.get('editor.auto_complete', True))
         self.auto_save.setChecked(self.settings.get('editor.auto_save', False))
+        self.highlight_line.setChecked(self.settings.get('editor.highlight_current_line', True))
 
         # Build
         self.pyinstaller_path.setText(self.settings.get('build.pyinstaller_path', ''))
@@ -411,6 +412,7 @@ def _save_settings(self):
         self.settings.set('editor.line_numbers', self.line_numbers.isChecked())
         self.settings.set('editor.auto_complete', self.auto_complete.isChecked())
         self.settings.set('editor.auto_save', self.auto_save.isChecked())
+        self.settings.set('editor.highlight_current_line', self.highlight_line.isChecked())
 
         # Build
         self.settings.set('build.pyinstaller_path', self.pyinstaller_path.text())

src/gui/main_window.py

@@ -12,10 +12,10 @@
 from PySide6.QtWidgets import (
     QMainWindow, QApplication, QWidget, QVBoxLayout, QHBoxLayout,
     QTabWidget, QMenuBar, QMenu, QToolBar, QStatusBar, QSplitter,
-    QLabel, QPushButton, QMessageBox, QFileDialog, QDockWidget
+    QLabel, QPushButton, QMessageBox, QFileDialog, QDockWidget, QInputDialog
 )
 from PySide6.QtCore import Qt, QTimer, QSize, Signal
-from PySide6.QtGui import QAction, QFont, QKeySequence, QIcon
+from PySide6.QtGui import QAction, QFont, QKeySequence, QIcon, QTextCursor
 
 # Lokale Imports
 sys.path.insert(0, str(Path(__file__).parent.parent))
@@ -70,6 +70,7 @@ def __init__(self):
         # Aktives Projekt
         self.current_project: Optional[ProjectConfig] = None
         self.open_files: Dict[str, CodeEditor] = {}
+        self._search_term = ""
 
         # UI Setup
         self.setWindowTitle("DevCenter")
@@ -546,13 +547,11 @@ def _setup_connections(self):
 
     def _restore_state(self):
         """Stellt den Fensterzustand wieder her"""
-        state = self.settings.get('window.state', {})
-        
-        if 'geometry' in state:
-            pass  # TODO: Geometrie wiederherstellen
-        
-        if 'maximized' in state and state['maximized']:
-            self.showMaximized()
+        geometry, state = self.settings.restore_window_state()
+        if geometry:
+            self.restoreGeometry(geometry)
+        if state:
+            self.restoreState(state)
 
     def _show_welcome(self):
         """Zeigt Welcome-Screen oder öffnet letztes Projekt"""
@@ -605,6 +604,7 @@ def _load_project(self, project: ProjectConfig):
     def _new_file(self):
         """Erstellt eine neue leere Datei"""
         editor = CodeEditor()
+        self._apply_editor_settings(editor)
         self.editor_tabs.addTab(editor, "Unbenannt")
         self.editor_tabs.setCurrentWidget(editor)
         self._connect_editor(editor)
@@ -628,6 +628,7 @@ def _open_file_path(self, path: str):
 
         # Neue Datei öffnen
         editor = CodeEditor()
+        self._apply_editor_settings(editor)
         if editor.load_file(path):
             self.open_files[path] = editor
             name = os.path.basename(path)
@@ -641,6 +642,21 @@ def _connect_editor(self, editor: CodeEditor):
         """Verbindet Editor-Signale"""
         editor.file_modified.connect(self._on_file_modified)
         editor.cursor_position_changed.connect(self._on_cursor_changed)
+
+    def _apply_editor_settings(self, editor: CodeEditor):
+        """Wendet die aktuellen Editor-Einstellungen auf einen Editor an."""
+        line_numbers = self.settings.get('editor.line_numbers', None)
+        if line_numbers is None:
+            line_numbers = self.settings.get('editor.show_line_numbers', True)
+
+        editor.apply_settings(
+            font_family=self.settings.get('editor.font_family', 'Consolas'),
+            font_size=self.settings.get('editor.font_size', 11),
+            tab_size=self.settings.get('editor.tab_size', 4),
+            show_line_numbers=bool(line_numbers),
+            auto_complete=self.settings.get('editor.auto_complete', True),
+            highlight_current_line=self.settings.get('editor.highlight_current_line', True),
+        )
 
     def _save_file(self):
         """Speichert die aktuelle Datei"""
@@ -760,12 +776,62 @@ def _paste(self):
             editor.paste()
 
     def _find(self):
-        """TODO: Such-Dialog"""
-        pass
+        """Öffnet einfachen Suchdialog."""
+        editor = self._get_current_editor()
+        if not editor:
+            self.statusbar.showMessage("Kein aktiver Editor vorhanden", 2000)
+            return
+
+        default = editor.textCursor().selectedText() or self._search_term
+        pattern, ok = QInputDialog.getText(
+            self, "Suchen", "Suchbegriff:", text=default
+        )
+        if not ok or not pattern:
+            return
+
+        self._search_term = pattern
+
+        if not editor.find(pattern):
+            cursor = editor.textCursor()
+            cursor.movePosition(QTextCursor.MoveOperation.Start)
+            editor.setTextCursor(cursor)
+            if not editor.find(pattern):
+                self.statusbar.showMessage(f"\"{pattern}\" nicht gefunden", 2500)
+                return
+
+        self.statusbar.showMessage(f"Gefunden: {pattern}", 2500)
 
     def _replace(self):
-        """TODO: Ersetzen-Dialog"""
-        pass
+        """Öffnet einfachen Ersetzen-Dialog."""
+        editor = self._get_current_editor()
+        if not editor:
+            self.statusbar.showMessage("Kein aktiver Editor vorhanden", 2000)
+            return
+
+        search_text, ok = QInputDialog.getText(
+            self, "Ersetzen", "Zu ersetzen:", text=editor.textCursor().selectedText()
+        )
+        if not ok or not search_text:
+            return
+
+        replace_text, ok = QInputDialog.getText(
+            self, "Ersetzen", "Durch diesen Text ersetzen:"
+        )
+        if not ok:
+            return
+
+        text = editor.toPlainText()
+        matches = text.count(search_text)
+        if matches == 0:
+            self.statusbar.showMessage(f'"{search_text}" nicht gefunden', 2500)
+            return
+
+        cursor_pos = editor.textCursor().position()
+        editor.setPlainText(text.replace(search_text, replace_text))
+        cursor = editor.textCursor()
+        cursor.setPosition(min(cursor_pos, len(editor.toPlainText())))
+        editor.setTextCursor(cursor)
+        self.statusbar.showMessage(f"{matches} Ersetzung(en) durchgeführt", 2500)
 
     # === Ansicht-Operationen ===
 
@@ -920,7 +986,10 @@ def _apply_settings(self):
         self.ai_service.set_api_key(self.settings.get('ai.api_key', ''))
 
         # Editor-Einstellungen auf alle offenen Editoren anwenden
-        # TODO: Implementieren
+        for index in range(self.editor_tabs.count()):
+            widget = self.editor_tabs.widget(index)
+            if isinstance(widget, CodeEditor):
+                self._apply_editor_settings(widget)
 
     def _show_about(self):
         """Zeigt den Über-Dialog"""

src/modules/editor/code_editor.py

@@ -203,6 +203,8 @@ def __init__(self, parent=None):
 
         # Tab-Einstellungen
         self.tab_size = 4
+        self.show_line_numbers = True
+        self.highlight_current_line_enabled = True
         tab_width = QFontMetrics(font).horizontalAdvance(' ') * self.tab_size
         self.setTabStopDistance(tab_width)
 
@@ -214,6 +216,7 @@ def __init__(self, parent=None):
 
         # Line Number Area
         self.line_number_area = LineNumberArea(self)
+        self.line_number_area.setVisible(self.show_line_numbers)
 
         # Connections
         self.blockCountChanged.connect(self._update_line_number_area_width)
@@ -254,6 +257,9 @@ def _setup_appearance(self):
 
     def line_number_area_width(self) -> int:
         """Berechnet die Breite des Zeilennummern-Bereichs"""
+        if not self.show_line_numbers:
+            return 0
+
         digits = 1
         max_num = max(1, self.blockCount())
         while max_num >= 10:
@@ -266,6 +272,7 @@ def line_number_area_width(self) -> int:
     def _update_line_number_area_width(self, new_block_count):
         """Aktualisiert die Breite des Zeilennummern-Bereichs"""
         self.setViewportMargins(self.line_number_area_width(), 0, 0, 0)
+        self.line_number_area.setVisible(self.show_line_numbers)
 
     def _update_line_number_area(self, rect, dy):
         """Aktualisiert den Zeilennummern-Bereich beim Scrollen"""
@@ -289,6 +296,9 @@ def resizeEvent(self, event):
 
     def line_number_area_paint_event(self, event):
         """Zeichnet die Zeilennummern"""
+        if not self.show_line_numbers:
+            return
+
         painter = QPainter(self.line_number_area)
         painter.fillRect(event.rect(), QColor("#1e1e1e"))
 
@@ -322,7 +332,7 @@ def _highlight_current_line(self):
         """Hebt die aktuelle Zeile hervor"""
         extra_selections = []
 
-        if not self.isReadOnly():
+        if self.highlight_current_line_enabled and not self.isReadOnly():
             selection = QTextEdit.ExtraSelection()
             line_color = QColor("#282828")
             selection.format.setBackground(line_color)
@@ -332,6 +342,44 @@ def _highlight_current_line(self):
             extra_selections.append(selection)
 
         self.setExtraSelections(extra_selections)
+
+    def apply_settings(
+        self,
+        font_family: Optional[str] = None,
+        font_size: Optional[int] = None,
+        tab_size: Optional[int] = None,
+        show_line_numbers: Optional[bool] = None,
+        auto_complete: Optional[bool] = None,
+        highlight_current_line: Optional[bool] = None,
+    ):
+        """Wendet Editor-Einstellungen auf diese Instanz an."""
+        font = QFont(self.font())
+
+        if font_family is not None:
+            font.setFamily(font_family)
+        if font_size is not None:
+            font.setPointSize(font_size)
+
+        self.setFont(font)
+
+        if tab_size is not None:
+            self.tab_size = max(1, int(tab_size))
+
+        tab_width = QFontMetrics(self.font()).horizontalAdvance(' ') * self.tab_size
+        self.setTabStopDistance(tab_width)
+
+        if show_line_numbers is not None:
+            self.show_line_numbers = bool(show_line_numbers)
+
+        if auto_complete is not None:
+            self.autocomplete_enabled = bool(auto_complete)
+
+        if highlight_current_line is not None:
+            self.highlight_current_line_enabled = bool(highlight_current_line)
+
+        self._update_line_number_area_width(0)
+        self.line_number_area.update()
+        self._highlight_current_line()
 
     def _emit_cursor_position(self):
         """Sendet die aktuelle Cursor-Position"""

tests/test_settings_application.py

@@ -0,0 +1,76 @@
+# -*- coding: utf-8 -*-
+"""Regressionstests für DevCenter-Einstellungen."""
+
+import os
+import sys
+import tempfile
+import unittest
+from pathlib import Path
+from unittest.mock import MagicMock
+
+os.environ.setdefault("QT_QPA_PLATFORM", "offscreen")
+
+sys.path.insert(0, str(Path(__file__).parent.parent / "src"))
+
+from PySide6.QtWidgets import QApplication, QTabWidget
+
+from core.settings_manager import SettingsManager
+from gui.dialogs.settings_dialog import SettingsDialog
+from gui.main_window import MainWindow
+from modules.editor.code_editor import CodeEditor
+
+
+class DevCenterSettingsTests(unittest.TestCase):
+    """Tests für die Anwendung von Editor-Einstellungen."""
+
+    @classmethod
+    def setUpClass(cls):
+        cls.app = QApplication.instance() or QApplication([])
+
+    def _temp_settings(self):
+        temp_dir = tempfile.TemporaryDirectory()
+        self.addCleanup(temp_dir.cleanup)
+        settings_path = Path(temp_dir.name) / "settings.json"
+        return SettingsManager(str(settings_path))
+
+    def test_settings_dialog_saves_highlight_current_line(self):
+        settings = self._temp_settings()
+        dialog = SettingsDialog(settings)
+
+        dialog.highlight_line.setChecked(False)
+        dialog._save_settings()
+
+        self.assertFalse(settings.get("editor.highlight_current_line"))
+
+    def test_main_window_applies_editor_settings_to_open_tabs(self):
+        settings = self._temp_settings()
+        settings.set("editor.font_family", "Courier New")
+        settings.set("editor.font_size", 14)
+        settings.set("editor.tab_size", 2)
+        settings.set("editor.line_numbers", False)
+        settings.set("editor.auto_complete", False)
+        settings.set("editor.highlight_current_line", False)
+        settings.set("ai.api_key", "secret-token")
+
+        window = MainWindow.__new__(MainWindow)
+        window.settings = settings
+        window.ai_service = MagicMock()
+        window.editor_tabs = QTabWidget()
+
+        editor = CodeEditor()
+        window.editor_tabs.addTab(editor, "scratch.py")
+
+        window._apply_settings()
+
+        window.ai_service.set_api_key.assert_called_once_with("secret-token")
+        self.assertEqual(editor.font().family(), "Courier New")
+        self.assertEqual(editor.font().pointSize(), 14)
+        self.assertEqual(editor.tab_size, 2)
+        self.assertEqual(editor.line_number_area_width(), 0)
+        self.assertFalse(editor.autocomplete_enabled)
+        self.assertFalse(editor.highlight_current_line_enabled)
+        self.assertEqual(editor.extraSelections(), [])
+
+
+if __name__ == "__main__":
+    unittest.main(verbosity=2)