synodic-client 0.0.1.dev30__tar.gz → 0.0.1.dev31__tar.gz

{synodic_client-0.0.1.dev30 → synodic_client-0.0.1.dev31}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: synodic_client
-Version: 0.0.1.dev30
+Version: 0.0.1.dev31
 Author-Email: Synodic Software <contact@synodic.software>
 License: LGPL-3.0-or-later
 Project-URL: homepage, https://github.com/synodic/synodic-client
@@ -8,7 +8,7 @@ Project-URL: repository, https://github.com/synodic/synodic-client
 Requires-Python: <3.15,>=3.14
 Requires-Dist: pyside6>=6.10.2
 Requires-Dist: packaging>=26.0
-Requires-Dist: porringer>=0.2.1.dev49
+Requires-Dist: porringer>=0.2.1.dev50
 Requires-Dist: qasync>=0.28.0
 Requires-Dist: velopack>=0.0.1442.dev64255
 Requires-Dist: typer>=0.24.1

{synodic_client-0.0.1.dev30 → synodic_client-0.0.1.dev31}/pyproject.toml

@@ -10,12 +10,12 @@ requires-python = ">=3.14, <3.15"
 dependencies = [
     "pyside6>=6.10.2",
     "packaging>=26.0",
-    "porringer>=0.2.1.dev49",
+    "porringer>=0.2.1.dev50",
     "qasync>=0.28.0",
     "velopack>=0.0.1442.dev64255",
     "typer>=0.24.1",
 ]
-version = "0.0.1.dev30"
+version = "0.0.1.dev31"
 
 [project.license]
 text = "LGPL-3.0-or-later"

synodic_client-0.0.1.dev31/synodic_client/_version.py

@@ -0,0 +1 @@
+__version__ = '0.0.1.dev31'

{synodic_client-0.0.1.dev30 → synodic_client-0.0.1.dev31}/synodic_client/application/qt.py

@@ -47,8 +47,7 @@ def _init_services(logger: logging.Logger) -> tuple[Client, API, GlobalConfigura
     cached_dirs = porringer.cache.list_directories()
 
     logger.info(
-        'Synodic Client v%s started (channel: %s, source: %s, '
-        'config_fields_set: %s, cached_projects: %d)',
+        'Synodic Client v%s started (channel: %s, source: %s, config_fields_set: %s, cached_projects: %d)',
         client.version,
         update_config.channel.name,
         update_config.repo_url,

{synodic_client-0.0.1.dev30 → synodic_client-0.0.1.dev31}/synodic_client/application/screen/screen.py

@@ -51,6 +51,7 @@ from synodic_client.application.theme import (
     PLUGIN_SECTION_SPACING,
     PLUGIN_TOGGLE_STYLE,
     PLUGIN_UPDATE_STYLE,
+    SETTINGS_GEAR_STYLE,
 )
 from synodic_client.config import GlobalConfiguration, save_config
 
@@ -794,6 +795,9 @@ class ProjectsView(QWidget):
 class MainWindow(QMainWindow):
     """Main window for the application."""
 
+    settings_requested = Signal()
+    """Emitted when the user clicks the settings gear button."""
+
     _tabs: QTabWidget | None = None
     _plugins_view: PluginsView | None = None
     _projects_view: ProjectsView | None = None
@@ -837,6 +841,13 @@ class MainWindow(QMainWindow):
             self._plugins_view = PluginsView(self._porringer, self._config, self)
             self._tabs.addTab(self._plugins_view, 'Plugins')
 
+            gear_btn = QPushButton('\u2699')
+            gear_btn.setStyleSheet(SETTINGS_GEAR_STYLE)
+            gear_btn.setToolTip('Settings')
+            gear_btn.setFlat(True)
+            gear_btn.clicked.connect(self.settings_requested.emit)
+            self._tabs.setCornerWidget(gear_btn)
+
             self.setCentralWidget(self._tabs)
 
         # Paint the window immediately, then refresh data asynchronously

synodic_client-0.0.1.dev31/synodic_client/application/screen/settings.py

@@ -0,0 +1,289 @@
+"""Settings window for the Synodic Client application.
+
+Provides a single-page window with grouped sections for all application
+settings.  Quick-access items (Channel, Check for Updates) remain in the
+tray menu; the full set is available here.
+"""
+
+import logging
+import sys
+from collections.abc import Iterator
+from contextlib import contextmanager
+
+from PySide6.QtCore import QUrl, Signal
+from PySide6.QtGui import QDesktopServices
+from PySide6.QtWidgets import (
+    QCheckBox,
+    QComboBox,
+    QFileDialog,
+    QHBoxLayout,
+    QLabel,
+    QLineEdit,
+    QMainWindow,
+    QPushButton,
+    QScrollArea,
+    QSpinBox,
+    QVBoxLayout,
+    QWidget,
+)
+
+from synodic_client.application.icon import app_icon
+from synodic_client.application.screen.card import CardFrame
+from synodic_client.application.theme import SETTINGS_WINDOW_MIN_SIZE
+from synodic_client.config import GlobalConfiguration, save_config
+from synodic_client.logging import log_path
+from synodic_client.startup import is_startup_registered, register_startup, remove_startup
+from synodic_client.updater import (
+    DEFAULT_AUTO_UPDATE_INTERVAL_MINUTES,
+    DEFAULT_TOOL_UPDATE_INTERVAL_MINUTES,
+    GITHUB_REPO_URL,
+)
+
+logger = logging.getLogger(__name__)
+
+
+class SettingsWindow(QMainWindow):
+    """Application settings window with grouped card sections.
+
+    All controls persist changes immediately via :func:`save_config` and
+    emit :attr:`settings_changed` so that the tray and updater can react.
+    """
+
+    settings_changed = Signal()
+    """Emitted whenever a setting is changed and persisted."""
+
+    def __init__(
+        self,
+        config: GlobalConfiguration,
+        parent: QWidget | None = None,
+    ) -> None:
+        """Initialise the settings window.
+
+        Args:
+            config: The shared global configuration object.
+            parent: Optional parent widget.
+        """
+        super().__init__(parent)
+        self._config = config
+        self.setWindowTitle('Synodic Settings')
+        self.setMinimumSize(*SETTINGS_WINDOW_MIN_SIZE)
+        self.setWindowIcon(app_icon())
+        self._init_ui()
+
+    # ------------------------------------------------------------------
+    # UI construction
+    # ------------------------------------------------------------------
+
+    def _init_ui(self) -> None:
+        """Build the scrollable settings layout."""
+        scroll = QScrollArea()
+        scroll.setWidgetResizable(True)
+        scroll.setFrameShape(QScrollArea.Shape.NoFrame)
+
+        container = QWidget()
+        layout = QVBoxLayout(container)
+        layout.setContentsMargins(16, 16, 16, 16)
+        layout.setSpacing(12)
+
+        layout.addWidget(self._build_updates_section())
+        layout.addWidget(self._build_startup_section())
+        layout.addWidget(self._build_advanced_section())
+        layout.addStretch()
+
+        scroll.setWidget(container)
+        self.setCentralWidget(scroll)
+
+    def _build_updates_section(self) -> CardFrame:
+        """Construct the *Updates* settings card."""
+        card = CardFrame('Updates')
+        content = card.content_layout
+
+        # Channel
+        row = QHBoxLayout()
+        label = QLabel('Channel')
+        label.setMinimumWidth(160)
+        row.addWidget(label)
+        self._channel_combo = QComboBox()
+        self._channel_combo.addItems(['Stable', 'Development'])
+        self._channel_combo.currentIndexChanged.connect(self._on_channel_changed)
+        row.addWidget(self._channel_combo)
+        row.addStretch()
+        content.addLayout(row)
+
+        # Update Source
+        row = QHBoxLayout()
+        label = QLabel('Update source')
+        label.setMinimumWidth(160)
+        row.addWidget(label)
+        self._source_edit = QLineEdit()
+        self._source_edit.setPlaceholderText(GITHUB_REPO_URL)
+        self._source_edit.editingFinished.connect(self._on_source_changed)
+        row.addWidget(self._source_edit, 1)
+        browse_btn = QPushButton('Browse\u2026')
+        browse_btn.clicked.connect(self._on_browse_source)
+        row.addWidget(browse_btn)
+        content.addLayout(row)
+
+        # Auto-update interval
+        row = QHBoxLayout()
+        label = QLabel('App update interval (min)')
+        label.setMinimumWidth(160)
+        row.addWidget(label)
+        self._auto_update_spin = QSpinBox()
+        self._auto_update_spin.setRange(0, 1440)
+        self._auto_update_spin.setSpecialValueText('Disabled')
+        self._auto_update_spin.valueChanged.connect(self._on_auto_update_interval_changed)
+        row.addWidget(self._auto_update_spin)
+        row.addStretch()
+        content.addLayout(row)
+
+        # Tool-update interval
+        row = QHBoxLayout()
+        label = QLabel('Tool update interval (min)')
+        label.setMinimumWidth(160)
+        row.addWidget(label)
+        self._tool_update_spin = QSpinBox()
+        self._tool_update_spin.setRange(0, 1440)
+        self._tool_update_spin.setSpecialValueText('Disabled')
+        self._tool_update_spin.valueChanged.connect(self._on_tool_update_interval_changed)
+        row.addWidget(self._tool_update_spin)
+        row.addStretch()
+        content.addLayout(row)
+
+        # Detect updates during previews
+        self._detect_updates_check = QCheckBox('Detect updates during previews')
+        self._detect_updates_check.toggled.connect(self._on_detect_updates_changed)
+        content.addWidget(self._detect_updates_check)
+
+        return card
+
+    def _build_startup_section(self) -> CardFrame:
+        """Construct the *Startup* settings card."""
+        card = CardFrame('Startup')
+        self._auto_start_check = QCheckBox('Start with Windows')
+        self._auto_start_check.toggled.connect(self._on_auto_start_changed)
+        card.content_layout.addWidget(self._auto_start_check)
+        return card
+
+    def _build_advanced_section(self) -> CardFrame:
+        """Construct the *Advanced* settings card."""
+        card = CardFrame('Advanced')
+        row = QHBoxLayout()
+        open_log_btn = QPushButton('Open Log\u2026')
+        open_log_btn.clicked.connect(self._open_log)
+        row.addWidget(open_log_btn)
+        row.addStretch()
+        card.content_layout.addLayout(row)
+        return card
+
+    # ------------------------------------------------------------------
+    # Public API
+    # ------------------------------------------------------------------
+
+    def sync_from_config(self) -> None:
+        """Synchronize all controls from the current configuration.
+
+        Signals are blocked during the update to prevent feedback loops.
+        """
+        config = self._config
+
+        with self._block_signals():
+            # Channel: index 0 = Stable, 1 = Development
+            is_dev = config.update_channel == 'dev'
+            self._channel_combo.setCurrentIndex(1 if is_dev else 0)
+
+            # Update source
+            self._source_edit.setText(config.update_source or '')
+
+            # Intervals
+            auto_interval = config.auto_update_interval_minutes
+            self._auto_update_spin.setValue(
+                auto_interval if auto_interval is not None else DEFAULT_AUTO_UPDATE_INTERVAL_MINUTES,
+            )
+            tool_interval = config.tool_update_interval_minutes
+            self._tool_update_spin.setValue(
+                tool_interval if tool_interval is not None else DEFAULT_TOOL_UPDATE_INTERVAL_MINUTES,
+            )
+
+            # Checkboxes
+            self._detect_updates_check.setChecked(config.detect_updates)
+            self._auto_start_check.setChecked(is_startup_registered())
+
+    def show(self) -> None:
+        """Sync controls from config, then show the window."""
+        self.sync_from_config()
+        super().show()
+        self.raise_()
+        self.activateWindow()
+
+    # ------------------------------------------------------------------
+    # Callbacks
+    # ------------------------------------------------------------------
+
+    def _persist(self) -> None:
+        """Save config and notify listeners."""
+        save_config(self._config)
+        self.settings_changed.emit()
+
+    @contextmanager
+    def _block_signals(self) -> Iterator[None]:
+        """Temporarily block signals on all settings controls."""
+        widgets = (
+            self._channel_combo,
+            self._source_edit,
+            self._auto_update_spin,
+            self._tool_update_spin,
+            self._detect_updates_check,
+            self._auto_start_check,
+        )
+        for w in widgets:
+            w.blockSignals(True)
+        try:
+            yield
+        finally:
+            for w in widgets:
+                w.blockSignals(False)
+
+    def _on_channel_changed(self, index: int) -> None:
+        self._config.update_channel = 'dev' if index == 1 else 'stable'
+        self._persist()
+
+    def _on_source_changed(self) -> None:
+        text = self._source_edit.text().strip()
+        self._config.update_source = text or None
+        self._persist()
+
+    def _on_browse_source(self) -> None:
+        path = QFileDialog.getExistingDirectory(self, 'Select Releases Directory')
+        if path:
+            self._source_edit.setText(path)
+            self._on_source_changed()
+
+    def _on_auto_update_interval_changed(self, value: int) -> None:
+        self._config.auto_update_interval_minutes = value
+        self._persist()
+
+    def _on_tool_update_interval_changed(self, value: int) -> None:
+        self._config.tool_update_interval_minutes = value
+        self._persist()
+
+    def _on_detect_updates_changed(self, checked: bool) -> None:
+        self._config.detect_updates = checked
+        self._persist()
+
+    def _on_auto_start_changed(self, checked: bool) -> None:
+        self._config.auto_start = checked
+        save_config(self._config)
+        if checked:
+            register_startup(sys.executable)
+        else:
+            remove_startup()
+        self.settings_changed.emit()
+
+    @staticmethod
+    def _open_log() -> None:
+        """Open the log file in the system's default editor."""
+        path = log_path()
+        if not path.exists():
+            path.touch()
+        QDesktopServices.openUrl(QUrl.fromLocalFile(str(path)))

{synodic_client-0.0.1.dev30 → synodic_client-0.0.1.dev31}/synodic_client/application/screen/tray.py

@@ -2,43 +2,32 @@
 
 import asyncio
 import logging
-import sys
 from pathlib import Path
 
 from porringer.api import API
 from porringer.schema import SetupParameters, SyncStrategy
-from PySide6.QtCore import QThread, QTimer, QUrl, Signal
-from PySide6.QtGui import QAction, QDesktopServices
+from PySide6.QtCore import QThread, QTimer, Signal
+from PySide6.QtGui import QAction
 from PySide6.QtWidgets import (
     QApplication,
-    QDialog,
-    QFileDialog,
-    QHBoxLayout,
-    QLabel,
-    QLineEdit,
     QMenu,
     QMessageBox,
     QProgressDialog,
-    QPushButton,
     QSystemTrayIcon,
-    QVBoxLayout,
-    QWidget,
 )
 
 from synodic_client.application.icon import app_icon
 from synodic_client.application.screen.screen import MainWindow
-from synodic_client.application.theme import UPDATE_SOURCE_DIALOG_MIN_WIDTH
+from synodic_client.application.screen.settings import SettingsWindow
 from synodic_client.client import Client
-from synodic_client.config import GlobalConfiguration, save_config
-from synodic_client.logging import log_path
+from synodic_client.config import GlobalConfiguration
 from synodic_client.resolution import (
     resolve_config,
     resolve_enabled_plugins,
     resolve_update_config,
     update_and_resolve,
 )
-from synodic_client.startup import is_startup_registered, register_startup, remove_startup
-from synodic_client.updater import GITHUB_REPO_URL, UpdateChannel, UpdateInfo
+from synodic_client.updater import UpdateChannel, UpdateInfo
 
 logger = logging.getLogger(__name__)
 
@@ -138,60 +127,6 @@ class ToolUpdateWorker(QThread):
             pass  # consume events to completion
 
 
-class UpdateSourceDialog(QDialog):
-    """Dialog for editing the Velopack update source URL or local path."""
-
-    def __init__(self, current_source: str | None, parent: QWidget | None = None) -> None:
-        """Initialise the dialog.
-
-        Args:
-            current_source: The current update source value (may be ``None``).
-            parent: Optional parent widget.
-        """
-        super().__init__(parent)
-        self.setWindowTitle('Update Source')
-        self.setMinimumWidth(UPDATE_SOURCE_DIALOG_MIN_WIDTH)
-
-        layout = QVBoxLayout(self)
-
-        label = QLabel(
-            'Enter a URL or local path for Velopack releases.\nLeave blank to use the default GitHub source.',
-        )
-        layout.addWidget(label)
-
-        self._source_edit = QLineEdit(current_source or '')
-        self._source_edit.setPlaceholderText(GITHUB_REPO_URL)
-
-        browse_button = QPushButton('Browse...')
-        browse_button.clicked.connect(self._browse)
-
-        row = QHBoxLayout()
-        row.addWidget(self._source_edit)
-        row.addWidget(browse_button)
-        layout.addLayout(row)
-
-        button_row = QHBoxLayout()
-        ok_button = QPushButton('OK')
-        cancel_button = QPushButton('Cancel')
-        button_row.addStretch()
-        button_row.addWidget(ok_button)
-        button_row.addWidget(cancel_button)
-        layout.addLayout(button_row)
-
-        ok_button.clicked.connect(self.accept)
-        cancel_button.clicked.connect(self.reject)
-
-    def _browse(self) -> None:
-        path = QFileDialog.getExistingDirectory(self, 'Select Releases Directory')
-        if path:
-            self._source_edit.setText(path)
-
-    @property
-    def source(self) -> str | None:
-        """Return the trimmed source text, or ``None`` if blank."""
-        return self._source_edit.text().strip() or None
-
-
 class TrayScreen:
     """Tray screen for the application."""
 
@@ -231,6 +166,13 @@ class TrayScreen:
 
         self._build_menu(app, window)
 
+        # Settings window (created once, shown/hidden on demand)
+        self._settings_window = SettingsWindow(self._resolve_config())
+        self._settings_window.settings_changed.connect(self._on_settings_changed)
+
+        # MainWindow gear button → open settings
+        window.settings_requested.connect(self._show_settings)
+
         # Periodic auto-update checking
         self._auto_update_timer: QTimer | None = None
         self._start_auto_update_timer()
@@ -253,24 +195,15 @@ class TrayScreen:
         self.menu.addAction(self.open_action)
         self.open_action.triggered.connect(window.show)
 
-        # Settings submenu
-        self.settings_menu = QMenu('Settings', self.menu)
-        self.menu.addMenu(self.settings_menu)
+        self.menu.addSeparator()
 
-        self.update_action = QAction('Check for Updates...', self.settings_menu)
+        self.update_action = QAction('Check for Updates...', self.menu)
         self.update_action.triggered.connect(self._on_check_updates)
-        self.settings_menu.addAction(self.update_action)
-
-        self.settings_menu.addSeparator()
-
-        # Update Source action
-        self.update_source_action = QAction('Update Source...', self.settings_menu)
-        self.update_source_action.triggered.connect(self._on_update_source)
-        self.settings_menu.addAction(self.update_source_action)
+        self.menu.addAction(self.update_action)
 
         # Update Channel submenu
-        self.channel_menu = QMenu('Update Channel', self.settings_menu)
-        self.settings_menu.addMenu(self.channel_menu)
+        self.channel_menu = QMenu('Update Channel', self.menu)
+        self.menu.addMenu(self.channel_menu)
 
         self._channel_stable_action = QAction('Stable', self.channel_menu)
         self._channel_stable_action.setCheckable(True)
@@ -285,20 +218,11 @@ class TrayScreen:
         # Set initial channel check state from config
         self._sync_channel_checks()
 
-        self.settings_menu.addSeparator()
-
-        # Start with Windows toggle
-        self._auto_start_action = QAction('Start with Windows', self.settings_menu)
-        self._auto_start_action.setCheckable(True)
-        self._auto_start_action.setChecked(is_startup_registered())
-        self._auto_start_action.triggered.connect(self._on_auto_start_toggled)
-        self.settings_menu.addAction(self._auto_start_action)
-
-        self.settings_menu.addSeparator()
+        self.menu.addSeparator()
 
-        self.open_log_action = QAction('Open Log...', self.settings_menu)
-        self.open_log_action.triggered.connect(self._open_log)
-        self.settings_menu.addAction(self.open_log_action)
+        self.settings_action = QAction('Settings\u2026', self.menu)
+        self.settings_action.triggered.connect(self._show_settings)
+        self.menu.addAction(self.settings_action)
 
         self.menu.addSeparator()
 
@@ -310,14 +234,6 @@ class TrayScreen:
 
     # -- Config helpers --
 
-    @staticmethod
-    def _open_log() -> None:
-        """Open the log file in the system's default editor."""
-        path = log_path()
-        if not path.exists():
-            path.touch()
-        QDesktopServices.openUrl(QUrl.fromLocalFile(str(path)))
-
     def _resolve_config(self) -> GlobalConfiguration:
         """Return the injected config or resolve from disk."""
         if self._config is not None:
@@ -376,38 +292,26 @@ class TrayScreen:
             self._window.raise_()
             self._window.activateWindow()
 
-    def _on_update_source(self) -> None:
-        """Open a dialog to edit the update source URL or local path."""
-        config = self._resolve_config()
-
-        parent = self._window if self._window.isVisible() else None
-        dialog = UpdateSourceDialog(config.update_source, parent)
+    def _show_settings(self) -> None:
+        """Show the settings window."""
+        self._settings_window.show()
 
-        if dialog.exec() == QDialog.DialogCode.Accepted:
-            config.update_source = dialog.source
-            logger.info('Update source changed to: %s', dialog.source or '(default)')
-            self._reinitialize_updater(config)
+    def _on_settings_changed(self) -> None:
+        """React to a change made in the settings window."""
+        config = self._resolve_config()
+        self._reinitialize_updater(config)
+        self._sync_channel_checks()
 
     def _on_channel_changed(self, channel: UpdateChannel) -> None:
-        """Handle channel selection change."""
+        """Handle channel selection change from the tray submenu."""
         config = self._resolve_config()
         config.update_channel = 'dev' if channel == UpdateChannel.DEVELOPMENT else 'stable'
         logger.info('Update channel changed to: %s', config.update_channel)
         self._sync_channel_checks()
         self._reinitialize_updater(config)
-
-    def _on_auto_start_toggled(self, checked: bool) -> None:
-        """Handle Start with Windows toggle."""
-        config = self._resolve_config()
-        config.auto_start = checked
-        save_config(config)
-
-        if checked:
-            register_startup(sys.executable)
-        else:
-            remove_startup()
-
-        logger.info('Auto-startup %s', 'enabled' if checked else 'disabled')
+        # Keep the settings window in sync if it is visible
+        if self._settings_window.isVisible():
+            self._settings_window.sync_from_config()
 
     def _reinitialize_updater(self, config: GlobalConfiguration) -> None:
         """Re-derive update settings and restart the updater and timers."""

{synodic_client-0.0.1.dev30 → synodic_client-0.0.1.dev31}/synodic_client/application/theme.py

@@ -9,7 +9,6 @@ code focused on layout and behaviour rather than pixel tweaking.
 # ---------------------------------------------------------------------------
 INSTALL_PREVIEW_MIN_SIZE = (650, 400)
 MAIN_WINDOW_MIN_SIZE = (600, 400)
-UPDATE_SOURCE_DIALOG_MIN_WIDTH = 450
 
 # ---------------------------------------------------------------------------
 # Layout margins (left, top, right, bottom)
@@ -275,3 +274,15 @@ METADATA_SKELETON_STYLE = (
     '}'
 )
 """Muted card frame used as the metadata placeholder during loading."""
+
+# ---------------------------------------------------------------------------
+# Settings window
+# ---------------------------------------------------------------------------
+SETTINGS_WINDOW_MIN_SIZE = (500, 450)
+"""Minimum size (width, height) for the Settings window."""
+
+SETTINGS_GEAR_STYLE = (
+    'QPushButton { border: none; font-size: 16px; padding: 2px 6px; }'
+    'QPushButton:hover { background: palette(midlight); border-radius: 3px; }'
+)
+"""Gear button style for the MainWindow tab corner widget."""

{synodic_client-0.0.1.dev30 → synodic_client-0.0.1.dev31}/synodic_client/resolution.py

@@ -21,6 +21,7 @@ from synodic_client.updater import (
     GITHUB_REPO_URL,
     UpdateChannel,
     UpdateConfig,
+    github_release_asset_url,
 )
 
 logger = logging.getLogger(__name__)
@@ -84,7 +85,10 @@ def resolve_update_config(config: GlobalConfiguration) -> UpdateConfig:
     else:
         channel = UpdateChannel.DEVELOPMENT if is_dev else UpdateChannel.STABLE
 
-    repo_url = config.update_source or GITHUB_REPO_URL
+    repo_url = github_release_asset_url(
+        config.update_source or GITHUB_REPO_URL,
+        channel,
+    )
 
     interval = config.auto_update_interval_minutes
     if interval is None: