PayPerTranscript 0.2.7__tar.gz → 0.2.8__tar.gz

{paypertranscript-0.2.7 → paypertranscript-0.2.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PayPerTranscript
-Version: 0.2.7
+Version: 0.2.8
 Summary: Open-Source Voice-to-Text mit Pay-per-Use Pricing
 Author: PayPerTranscript Contributors
 License-Expression: MIT

{paypertranscript-0.2.7 → paypertranscript-0.2.8}/PayPerTranscript.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PayPerTranscript
-Version: 0.2.7
+Version: 0.2.8
 Summary: Open-Source Voice-to-Text mit Pay-per-Use Pricing
 Author: PayPerTranscript Contributors
 License-Expression: MIT

{paypertranscript-0.2.7 → paypertranscript-0.2.8}/PayPerTranscript.egg-info/SOURCES.txt

@@ -14,6 +14,8 @@ paypertranscript/assets/icons/app.png
 paypertranscript/assets/icons/app_big.png
 paypertranscript/assets/icons/arrow_down.svg
 paypertranscript/assets/icons/tray.png
+paypertranscript/assets/icons/tray_green.png
+paypertranscript/assets/icons/tray_orange.png
 paypertranscript/assets/sounds/start.wav
 paypertranscript/assets/sounds/stop.wav
 paypertranscript/assets/styles/dark.qss

{paypertranscript-0.2.7 → paypertranscript-0.2.8}/paypertranscript/__init__.py

@@ -1,3 +1,3 @@
 """PayPerTranscript - Voice-to-Text mit Pay-per-Use Pricing."""
 
-__version__ = "0.2.7"
+__version__ = "0.2.8"

{paypertranscript-0.2.7 → paypertranscript-0.2.8}/paypertranscript/core/config.py

@@ -97,11 +97,22 @@ _SCHEMA: dict[str, type | tuple[type, ...]] = {
 }
 
 
+# Keys whose dict values represent user data collections (not config structure).
+# These are replaced entirely by the user's saved value, not recursively merged,
+# so that deletions of default entries persist across restarts.
+_REPLACE_KEYS = frozenset({"window_mappings", "categories"})
+
+
 def _deep_merge(base: dict, override: dict) -> dict:
     """Merge override in base (rekursiv). Gibt neues Dict zurück."""
     result = copy.deepcopy(base)
     for key, value in override.items():
-        if key in result and isinstance(result[key], dict) and isinstance(value, dict):
+        if (
+            key in result
+            and isinstance(result[key], dict)
+            and isinstance(value, dict)
+            and key not in _REPLACE_KEYS
+        ):
             result[key] = _deep_merge(result[key], value)
         else:
             result[key] = copy.deepcopy(value)

{paypertranscript-0.2.7 → paypertranscript-0.2.8}/paypertranscript/ui/main_window.py

@@ -16,10 +16,6 @@ from paypertranscript.core.logging import get_logger
 from paypertranscript.core.paths import get_icons_dir
 from paypertranscript.core.session_logger import SessionLogger
 from paypertranscript.ui.pages.home_page import HomePage
-from paypertranscript.ui.pages.settings_page import SettingsPage
-from paypertranscript.ui.pages.statistics_page import StatisticsPage
-from paypertranscript.ui.pages.window_mapping_page import WindowMappingPage
-from paypertranscript.ui.pages.word_list_page import WordListPage
 from paypertranscript.ui.sidebar import Sidebar
 
 log = get_logger("ui.main_window")
@@ -86,29 +82,81 @@ class MainWindow(QDialog):
         self._stack = QStackedWidget()
         self._stack.setStyleSheet("QStackedWidget { background-color: #121218; }")
 
-        # Seiten erstellen (Reihenfolge muss mit Sidebar-Indizes uebereinstimmen)
-        self._home_page = HomePage(config, session_logger, get_last_transcription)
-        self._statistics_page = StatisticsPage(session_logger) if session_logger else QWidget()
-        self._settings_page = SettingsPage(config, hotkey_listener)
-        self._word_list_page = WordListPage(config)
-        self._window_mapping_page = WindowMappingPage(config)
+        # Lazy Page Loading: Nur HomePage sofort erstellen, Rest on-demand.
+        self._pages: dict[int, QWidget] = {}
+        self._page_factories: dict[int, Callable[[], QWidget]] = {
+            1: lambda: self._create_statistics_page(session_logger),
+            2: lambda: self._create_settings_page(config, hotkey_listener),
+            3: lambda: self._create_word_list_page(config),
+            4: lambda: self._create_window_mapping_page(config),
+        }
 
-        self._stack.addWidget(self._home_page)         # 0
-        self._stack.addWidget(self._statistics_page)    # 1
-        self._stack.addWidget(self._settings_page)      # 2
-        self._stack.addWidget(self._word_list_page)     # 3
-        self._stack.addWidget(self._window_mapping_page)  # 4
+        # HomePage (Index 0) sofort — wird bei jedem Oeffnen angezeigt
+        home = HomePage(config, session_logger, get_last_transcription)
+        self._pages[0] = home
+        self._stack.addWidget(home)  # 0
+
+        # Placeholders fuer restliche Seiten
+        for _ in range(1, 5):
+            self._stack.addWidget(QWidget())
 
         layout.addWidget(self._stack, 1)
 
+    # -- Lazy Page Factories --
+
+    @staticmethod
+    def _create_statistics_page(session_logger: SessionLogger | None) -> QWidget:
+        from paypertranscript.ui.pages.statistics_page import StatisticsPage
+
+        return StatisticsPage(session_logger) if session_logger else QWidget()
+
+    @staticmethod
+    def _create_settings_page(
+        config: ConfigManager, hotkey_listener: HotkeyListener | None
+    ) -> QWidget:
+        from paypertranscript.ui.pages.settings_page import SettingsPage
+
+        return SettingsPage(config, hotkey_listener)
+
+    @staticmethod
+    def _create_word_list_page(config: ConfigManager) -> QWidget:
+        from paypertranscript.ui.pages.word_list_page import WordListPage
+
+        return WordListPage(config)
+
+    @staticmethod
+    def _create_window_mapping_page(config: ConfigManager) -> QWidget:
+        from paypertranscript.ui.pages.window_mapping_page import WindowMappingPage
+
+        return WindowMappingPage(config)
+
+    def _ensure_page(self, index: int) -> None:
+        """Erstellt die Seite beim ersten Zugriff (lazy loading)."""
+        if index in self._pages:
+            return
+        factory = self._page_factories.pop(index, None)
+        if factory is None:
+            return
+        page = factory()
+        self._pages[index] = page
+        old = self._stack.widget(index)
+        self._stack.removeWidget(old)
+        self._stack.insertWidget(index, page)
+        old.deleteLater()
+        log.debug("Seite %d lazy erstellt: %s", index, type(page).__name__)
+
+    # -- Navigation --
+
     def _on_page_changed(self, index: int) -> None:
-        """Wechselt zur angeforderten Seite."""
+        """Wechselt zur angeforderten Seite (lazy creation bei Erstaufruf)."""
+        self._ensure_page(index)
         self._stack.setCurrentIndex(index)
         self._sidebar.set_active(index)
 
     def navigate_to(self, page_index: int) -> None:
         """Navigiert zu einer bestimmten Seite und zeigt das Fenster."""
         if 0 <= page_index < self._stack.count():
+            self._ensure_page(page_index)
             self._stack.setCurrentIndex(page_index)
             self._sidebar.set_active(page_index)
         self.show()

{paypertranscript-0.2.7 → paypertranscript-0.2.8}/paypertranscript/ui/pages/window_mapping_page.py

@@ -166,30 +166,18 @@ class _MappingItemDelegate(QStyledItemDelegate):
         option: QStyleOptionViewItem,
         index: QModelIndex,
     ) -> bool:
-        if event.type() in (QEvent.Type.MouseMove, QEvent.Type.MouseButtonRelease):
+        # Click handling is done via viewport event filter in WindowMappingPage
+        # (editorEvent does not receive MouseButtonRelease with default edit triggers)
+        if event.type() == QEvent.Type.MouseMove:
             mouse: QMouseEvent = event  # type: ignore[assignment]
-            x = mouse.position().x()
-            delete_left = option.rect.right() - self._ICON_SIZE
-            edit_left = option.rect.right() - self._ICONS_TOTAL
-            over_icon = x >= edit_left
-
-            if event.type() == QEvent.Type.MouseMove:
-                view = option.widget
-                if view is not None:
-                    if over_icon:
-                        view.setCursor(QCursor(Qt.CursorShape.PointingHandCursor))
-                    else:
-                        view.unsetCursor()
-                return False
-
-            # MouseButtonRelease
-            if x >= delete_left:
-                self._on_delete(index.row())
-                return True
-            if x >= edit_left:
-                self._on_edit(index.row())
-                return True
-
+            over_icon = mouse.position().x() >= option.rect.right() - self._ICONS_TOTAL
+            view = option.widget
+            if view is not None:
+                if over_icon:
+                    view.setCursor(QCursor(Qt.CursorShape.PointingHandCursor))
+                else:
+                    view.unsetCursor()
+            return False
         return super().editorEvent(event, model, option, index)
 
     def sizeHint(self, option: QStyleOptionViewItem, index: QModelIndex) -> QSize:
@@ -263,24 +251,17 @@ class _CategoryItemDelegate(QStyledItemDelegate):
         option: QStyleOptionViewItem,
         index: QModelIndex,
     ) -> bool:
-        if event.type() in (QEvent.Type.MouseMove, QEvent.Type.MouseButtonRelease):
+        # Click handling is done via viewport event filter in WindowMappingPage
+        if event.type() == QEvent.Type.MouseMove:
             mouse: QMouseEvent = event  # type: ignore[assignment]
             over_icon = mouse.position().x() >= option.rect.right() - self._ICON_SIZE
-
-            if event.type() == QEvent.Type.MouseMove:
-                view = option.widget
-                if view is not None:
-                    if over_icon:
-                        view.setCursor(QCursor(Qt.CursorShape.PointingHandCursor))
-                    else:
-                        view.unsetCursor()
-                return False
-
-            # MouseButtonRelease
-            if over_icon:
-                self._on_delete(index.row())
-                return True
-
+            view = option.widget
+            if view is not None:
+                if over_icon:
+                    view.setCursor(QCursor(Qt.CursorShape.PointingHandCursor))
+                else:
+                    view.unsetCursor()
+            return False
         return super().editorEvent(event, model, option, index)
 
     def sizeHint(self, option: QStyleOptionViewItem, index: QModelIndex) -> QSize:
@@ -321,6 +302,11 @@ class WindowMappingPage(QWidget):
         self._tabs.addTab(self._create_categories_tab(), "Kategorien")
         layout.addWidget(self._tabs, 1)
 
+        # Viewport event filters for reliable icon click handling
+        # (editorEvent does not receive MouseButtonRelease with default edit triggers)
+        self._mapping_list.viewport().installEventFilter(self)
+        self._cat_list.viewport().installEventFilter(self)
+
     # -- Tab: Zuordnungen --
 
     def _create_mappings_tab(self) -> QWidget:
@@ -438,6 +424,46 @@ class WindowMappingPage(QWidget):
 
         return tab
 
+    # -- Viewport event filter: icon clicks --
+
+    def eventFilter(self, watched: object, event: QEvent) -> bool:
+        """Intercept mouse clicks on delegate icons (edit/delete)."""
+        if event.type() == QEvent.Type.MouseButtonRelease:
+            mouse: QMouseEvent = event  # type: ignore[assignment]
+            if watched is self._mapping_list.viewport():
+                return self._handle_mapping_icon_click(mouse)
+            if watched is self._cat_list.viewport():
+                return self._handle_category_icon_click(mouse)
+        return super().eventFilter(watched, event)
+
+    def _handle_mapping_icon_click(self, event: QMouseEvent) -> bool:
+        pos = event.position().toPoint()
+        index = self._mapping_list.indexAt(pos)
+        if not index.isValid():
+            return False
+        rect = self._mapping_list.visualRect(index)
+        x = event.position().x()
+        delete_left = rect.right() - _MappingItemDelegate._ICON_SIZE
+        edit_left = rect.right() - _MappingItemDelegate._ICONS_TOTAL
+        if x >= delete_left:
+            self._remove_mapping_at(index.row())
+            return True
+        if x >= edit_left:
+            self._edit_mapping_at(index.row())
+            return True
+        return False
+
+    def _handle_category_icon_click(self, event: QMouseEvent) -> bool:
+        pos = event.position().toPoint()
+        index = self._cat_list.indexAt(pos)
+        if not index.isValid():
+            return False
+        rect = self._cat_list.visualRect(index)
+        if event.position().x() >= rect.right() - _CategoryItemDelegate._ICON_SIZE:
+            self._delete_category_at(index.row())
+            return True
+        return False
+
     # -- Daten laden --
 
     def _reload_all(self) -> None:

{paypertranscript-0.2.7 → paypertranscript-0.2.8}/paypertranscript/ui/pages/word_list_page.py

@@ -110,27 +110,17 @@ class _WordItemDelegate(QStyledItemDelegate):
         option: QStyleOptionViewItem,
         index: QModelIndex,
     ) -> bool:
-        """Start editing when the edit icon area is clicked."""
-        if event.type() in (QEvent.Type.MouseMove, QEvent.Type.MouseButtonRelease):
+        """Cursor change on hover; click handling via viewport event filter."""
+        if event.type() == QEvent.Type.MouseMove:
             mouse: QMouseEvent = event  # type: ignore[assignment]
-            edit_left = option.rect.right() - self._EDIT_WIDTH
-            over_icon = mouse.position().x() >= edit_left
-
-            if event.type() == QEvent.Type.MouseMove:
-                view = option.widget
-                if view is not None:
-                    if over_icon:
-                        view.setCursor(QCursor(Qt.CursorShape.PointingHandCursor))
-                    else:
-                        view.unsetCursor()
-                return False
-
-            # MouseButtonRelease
-            if over_icon:
-                view = option.widget
-                if view is not None:
-                    view.edit(index)
-                return True
+            over_icon = mouse.position().x() >= option.rect.right() - self._EDIT_WIDTH
+            view = option.widget
+            if view is not None:
+                if over_icon:
+                    view.setCursor(QCursor(Qt.CursorShape.PointingHandCursor))
+                else:
+                    view.unsetCursor()
+            return False
         return super().editorEvent(event, model, option, index)
 
     def sizeHint(self, option: QStyleOptionViewItem, index: QModelIndex) -> QSize:
@@ -200,6 +190,9 @@ class WordListPage(QWidget):
         self._list.itemChanged.connect(self._on_word_edited)
         layout.addWidget(self._list, 1)
 
+        # Viewport event filter for reliable edit icon click handling
+        self._list.viewport().installEventFilter(self)
+
         # Entfernen + Token-Counter
         action_row = QHBoxLayout()
         btn_remove = QPushButton("Entfernen")
@@ -213,6 +206,22 @@ class WordListPage(QWidget):
         action_row.addWidget(self._counter_label)
         layout.addLayout(action_row)
 
+    def eventFilter(self, watched: object, event: QEvent) -> bool:
+        """Intercept mouse clicks on the edit (pencil) icon."""
+        if (
+            event.type() == QEvent.Type.MouseButtonRelease
+            and watched is self._list.viewport()
+        ):
+            mouse: QMouseEvent = event  # type: ignore[assignment]
+            pos = mouse.position().toPoint()
+            index = self._list.indexAt(pos)
+            if index.isValid():
+                rect = self._list.visualRect(index)
+                if mouse.position().x() >= rect.right() - _WordItemDelegate._EDIT_WIDTH:
+                    self._list.edit(index)
+                    return True
+        return super().eventFilter(watched, event)
+
     def _load_words(self) -> None:
         self._updating = True
         words = self._config.get("words.misspelled_words", [])

{paypertranscript-0.2.7 → paypertranscript-0.2.8}/paypertranscript/ui/tray.py

@@ -5,8 +5,8 @@ QSystemTrayIcon mit Kontextmenue und Icon-Zustandswechsel.
 
 from collections.abc import Callable
 
-from PySide6.QtCore import QRectF, Qt, Slot
-from PySide6.QtGui import QColor, QIcon, QPainter, QPen, QPixmap
+from PySide6.QtCore import Qt, Slot
+from PySide6.QtGui import QIcon, QPixmap
 from PySide6.QtWidgets import (
     QHBoxLayout,
     QLabel,
@@ -27,84 +27,39 @@ from paypertranscript.core.session_logger import SessionLogger
 
 log = get_logger("ui.tray")
 
-# Status-Dot Farben (konsistent mit Overlay-Design)
-_DOT_RECORDING = "#f87171"  # Rot (universelle Aufnahme-Konvention)
-_DOT_PROCESSING = "#34d399"  # Emerald (aktive Verarbeitung)
+# Icon-Dateinamen fuer die drei Zustaende
+_ICON_FILES: dict[str, str] = {
+    "idle": "tray.png",
+    "recording": "tray_orange.png",
+    "processing": "tray_green.png",
+}
 
-# Dot-Groesse relativ zum Icon
-_DOT_RADIUS_RATIO = 0.30  # 30% der Icon-Groesse (~60% Durchmesser)
-_DOT_BORDER_RATIO = 0.04  # Dunkler Rand um den Dot
 
+def _load_icon(filename: str, size: int = 64) -> QIcon:
+    """Laedt ein Tray-Icon aus den Assets.
 
-def _load_base_pixmap(size: int = 64) -> QPixmap:
-    """Laedt das Basis-Logo fuer das Tray-Icon.
-
-    Sucht nach tray.png in den Assets. Fallback: weisser Kreis.
+    Args:
+        filename: Dateiname im icons-Ordner.
+        size: Zielgroesse in Pixeln.
     """
-    tray_path = get_icons_dir() / "tray.png"
-    if tray_path.exists():
-        source = QPixmap(str(tray_path))
-        if not source.isNull():
-            return source.scaled(
+    path = get_icons_dir() / filename
+    if path.exists():
+        pixmap = QPixmap(str(path))
+        if not pixmap.isNull():
+            scaled = pixmap.scaled(
                 size, size,
                 Qt.AspectRatioMode.KeepAspectRatio,
                 Qt.TransformationMode.SmoothTransformation,
             )
+            return QIcon(scaled)
 
-    # Fallback: weisser Kreis (wie bisher)
-    pixmap = QPixmap(size, size)
-    pixmap.fill(QColor(0, 0, 0, 0))
-    painter = QPainter(pixmap)
-    painter.setRenderHint(QPainter.RenderHint.Antialiasing)
-    painter.setBrush(QColor("#ffffff"))
-    painter.setPen(QColor(0, 0, 0, 0))
-    painter.drawEllipse(4, 4, size - 8, size - 8)
-    painter.end()
-    return pixmap
-
-
-def _create_icon_with_dot(base: QPixmap, dot_color: str | None = None) -> QIcon:
-    """Erstellt ein Tray-Icon aus dem Basis-Logo, optional mit Status-Dot.
-
-    Args:
-        base: Basis-Pixmap (Logo).
-        dot_color: Hex-Farbe fuer den Status-Dot. None = kein Dot (idle).
-    """
-    pixmap = base.copy()
-
-    if dot_color is not None:
-        size = pixmap.width()
-        dot_r = size * _DOT_RADIUS_RATIO
-        border_w = max(1.0, size * _DOT_BORDER_RATIO)
-
-        # Position: unten rechts mit kleinem Abstand zum Rand
-        cx = size - dot_r - border_w - 1
-        cy = size - dot_r - border_w - 1
-
-        painter = QPainter(pixmap)
-        painter.setRenderHint(QPainter.RenderHint.Antialiasing)
-
-        # Dunkler Rand (hebt den Dot vom Logo ab)
-        painter.setPen(QPen(QColor(18, 18, 24, 200), border_w))
-        painter.setBrush(QColor(dot_color))
-        painter.drawEllipse(QRectF(cx - dot_r, cy - dot_r, dot_r * 2, dot_r * 2))
-
-        painter.end()
-
-    return QIcon(pixmap)
+    log.warning("Tray-Icon nicht gefunden: %s", path)
+    return QIcon()
 
 
 def create_tray_icons() -> dict[str, QIcon]:
-    """Erstellt alle Tray-Icons (idle, recording, processing).
-
-    Idle: Logo pur. Recording: Logo + Emerald-Dot. Processing: Logo + Grau-Dot.
-    """
-    base = _load_base_pixmap(64)
-    return {
-        "idle": _create_icon_with_dot(base),
-        "recording": _create_icon_with_dot(base, _DOT_RECORDING),
-        "processing": _create_icon_with_dot(base, _DOT_PROCESSING),
-    }
+    """Laedt alle Tray-Icons (idle, recording, processing) aus PNG-Dateien."""
+    return {state: _load_icon(fname) for state, fname in _ICON_FILES.items()}
 
 
 # ---------------------------------------------------------------------------

{paypertranscript-0.2.7 → paypertranscript-0.2.8}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "PayPerTranscript"
-version = "0.2.7"
+version = "0.2.8"
 description = "Open-Source Voice-to-Text mit Pay-per-Use Pricing"
 license = "MIT"
 requires-python = ">=3.12"