feat: add QconnectBadge as full-height badge in song card

Place QConnect badge as direct child of badges-group with 3px gap
matching DAC/EXC spacing. Two-row vertical layout: icon on top,
Qobuz/Connect text below. Wire props from +page.svelte to both
NowPlayingBar instances. Add qconnect i18n keys to de/fr/pt locales.

cc
This commit is contained in:
vicrodh committed 2026-03-18 21:03:56 -06:00
1 parent d4fa6f4210
commit 2953b86062
8 files changed
+613 -6

No files matched your search

+27 -4
View File
@@ -20,6 +20,7 @@
} from 'lucide-svelte';
import QualityBadge from './QualityBadge.svelte';
import AudioOutputBadges from './AudioOutputBadges.svelte';
import QconnectBadge from './QconnectBadge.svelte';
import StackIcon from './StackIcon.svelte';
import { cachedSrc } from '$lib/actions/cachedImage';
import { t as translateStore } from '$lib/i18n';
@@ -30,6 +31,7 @@
type OfflineReason
} from '$lib/stores/offlineStore';
import { toggleMute } from '$lib/stores/playerStore';
import type { QconnectSessionSnapshot } from '$lib/services/qconnectRuntime';
interface Props {
artwork?: string;
@@ -78,6 +80,9 @@
onToggleNormalization?: () => void;
controlsDisabled?: boolean;
explicit?: boolean;
qconnectSessionSnapshot?: QconnectSessionSnapshot | null;
onToggleQconnectConnection?: () => void | Promise<void>;
qconnectBusy?: boolean;
}
let {
@@ -127,6 +132,9 @@
onToggleNormalization,
controlsDisabled = false,
explicit = false,
qconnectSessionSnapshot = null,
onToggleQconnectConnection,
qconnectBusy = false,
}: Props = $props();
let progressRef: HTMLDivElement;
@@ -383,11 +391,19 @@
</div>
</div>
<div class="quality-indicator">
<QualityBadge {quality} {bitDepth} {samplingRate} {originalBitDepth} {originalSamplingRate} {format} />
<div class="audio-badges-row">
<AudioOutputBadges {samplingRate} />
<div class="badges-group">
<div class="quality-indicator">
<QualityBadge {quality} {bitDepth} {samplingRate} {originalBitDepth} {originalSamplingRate} {format} />
<div class="audio-badges-row">
<AudioOutputBadges {samplingRate} />
</div>
</div>
<QconnectBadge
connected={isQobuzConnectConnected}
sessionSnapshot={qconnectSessionSnapshot}
onToggleConnection={onToggleQconnectConnection ?? (() => {})}
busy={qconnectBusy}
/>
</div>
</div>
{:else}
@@ -974,6 +990,13 @@
margin: 0;
}
.badges-group {
display: flex;
align-items: stretch;
gap: 3px;
flex-shrink: 0;
}
.audio-badges-row {
display: flex;
height: 20px;
+415
View File
@@ -0,0 +1,415 @@
<script lang="ts">
import { invoke } from '@tauri-apps/api/core';
import { Monitor, Globe, Smartphone, Speaker, Info, Power } from 'lucide-svelte';
import { t } from '$lib/i18n';
import type { QconnectSessionSnapshot, QconnectRendererInfo } from '$lib/services/qconnectRuntime';
interface Props {
connected: boolean;
sessionSnapshot: QconnectSessionSnapshot | null;
onToggleConnection: () => void | Promise<void>;
busy?: boolean;
}
let {
connected,
sessionSnapshot = null,
onToggleConnection,
busy = false,
}: Props = $props();
let isPopupOpen = $state(false);
let isInfoHovering = $state(false);
let settingRenderer = $state(false);
function togglePopup(): void {
isPopupOpen = !isPopupOpen;
}
function closePopup(): void {
isPopupOpen = false;
}
async function setActiveRenderer(rendererId: number): Promise<void> {
if (settingRenderer) return;
settingRenderer = true;
try {
await invoke('v2_qconnect_set_active_renderer', { rendererId });
} catch (err) {
console.warn('[QconnectBadge] set_active_renderer failed:', err);
} finally {
settingRenderer = false;
}
}
function resolveDeviceType(renderer: QconnectRendererInfo): 'computer' | 'web' | 'mobile' | 'speaker' {
const dtype = renderer.device_type ?? 5;
if (dtype === 6) return 'mobile';
if (dtype === 5) {
const name = (renderer.friendly_name ?? '').toLowerCase();
if (name.includes('web player') || name.includes('browser')) return 'web';
return 'computer';
}
// device_type 3 or 4 or other → speaker/receiver
return 'speaker';
}
function rendererDisplayName(renderer: QconnectRendererInfo): string {
if (renderer.friendly_name) return renderer.friendly_name;
const parts = [renderer.brand, renderer.model].filter(Boolean);
return parts.length > 0 ? parts.join(' ') : `Renderer ${renderer.renderer_id}`;
}
const activeRenderer = $derived(
sessionSnapshot?.renderers.find(
(r) => r.renderer_id === sessionSnapshot?.active_renderer_id
) ?? null
);
const activeDeviceType = $derived(
activeRenderer ? resolveDeviceType(activeRenderer) : 'computer'
);
const isLocalRendererActive = $derived(
sessionSnapshot?.active_renderer_id === sessionSnapshot?.local_renderer_id
);
</script>
<!-- svelte-ignore a11y_click_events_have_key_events -->
<!-- svelte-ignore a11y_no_static_element_interactions -->
<div class="qconnect-badge-wrapper">
<button
class="qconnect-badge"
class:active={connected}
onclick={togglePopup}
title={connected ? $t('qconnect.statusConnected') : $t('qconnect.statusDisconnected')}
>
<span class="badge-icon">
{#if activeDeviceType === 'web'}
<Globe size={16} />
{:else if activeDeviceType === 'mobile'}
<Smartphone size={16} />
{:else if activeDeviceType === 'speaker'}
<Speaker size={16} />
{:else}
<Monitor size={16} />
{/if}
</span>
<span class="badge-text">
<span class="badge-label">Qobuz</span>
<span class="badge-label">Connect</span>
</span>
</button>
{#if isPopupOpen}
<!-- svelte-ignore a11y_no_static_element_interactions -->
<div class="popup-backdrop" onclick={closePopup}></div>
<div class="qconnect-popup">
<div class="popup-header">
<span class="popup-title">{$t('qconnect.title')}</span>
<div class="popup-header-actions">
<div
class="info-trigger"
onmouseenter={() => (isInfoHovering = true)}
onmouseleave={() => (isInfoHovering = false)}
>
<Info size={14} />
{#if isInfoHovering}
<div class="info-tooltip">
<p>{$t('qconnect.experimentalWarning')}</p>
<p>{$t('qconnect.localLibraryWarning')}</p>
</div>
{/if}
</div>
</div>
</div>
{#if connected && sessionSnapshot}
<div class="renderer-list">
{#each sessionSnapshot.renderers as renderer (renderer.renderer_id)}
{@const dtype = resolveDeviceType(renderer)}
{@const isActive = renderer.renderer_id === sessionSnapshot.active_renderer_id}
{@const isLocal = renderer.renderer_id === sessionSnapshot.local_renderer_id}
<button
class="renderer-item"
class:active={isActive}
onclick={() => setActiveRenderer(renderer.renderer_id)}
disabled={isActive || settingRenderer}
>
<span class="renderer-icon" class:active={isActive}>
{#if dtype === 'web'}
<Globe size={14} />
{:else if dtype === 'mobile'}
<Smartphone size={14} />
{:else if dtype === 'speaker'}
<Speaker size={14} />
{:else}
<Monitor size={14} />
{/if}
</span>
<span class="renderer-name">
{rendererDisplayName(renderer)}
{#if isLocal}
<span class="this-device">({$t('qconnect.thisDevice')})</span>
{/if}
</span>
</button>
{/each}
</div>
{:else}
<div class="disconnected-message">
<span>{$t('qconnect.statusDisconnected')}</span>
</div>
{/if}
<div class="popup-footer">
<button
class="toggle-btn"
class:on={connected}
onclick={onToggleConnection}
disabled={busy}
>
<Power size={12} />
<span>{connected ? $t('qconnect.turnOff') : $t('qconnect.turnOn')}</span>
</button>
</div>
</div>
{/if}
</div>
<style>
.qconnect-badge-wrapper {
position: relative;
display: flex;
align-items: stretch;
}
.qconnect-badge {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
gap: 3px;
padding: 4px 6px;
border-radius: 3px;
font-size: 7px;
font-weight: 600;
text-transform: uppercase;
letter-spacing: 0.3px;
cursor: pointer;
transition: color 200ms ease, background 200ms ease, border-color 200ms ease;
background: transparent;
color: var(--alpha-15);
border: 1px solid var(--alpha-6);
white-space: nowrap;
height: 100%;
line-height: 1;
}
.qconnect-badge.active {
background: rgba(234, 179, 8, 0.2);
color: #eab308;
border-color: rgba(234, 179, 8, 0.4);
}
.qconnect-badge:hover {
opacity: 0.85;
}
.badge-icon {
display: flex;
align-items: center;
justify-content: center;
flex: 1;
}
.badge-text {
display: flex;
flex-direction: column;
align-items: center;
flex: 1;
justify-content: center;
gap: 0;
}
.badge-label {
line-height: 1.1;
}
/* Popup */
.popup-backdrop {
position: fixed;
inset: 0;
z-index: 9998;
}
.qconnect-popup {
position: absolute;
bottom: calc(100% + 8px);
right: 0;
z-index: 9999;
min-width: 240px;
max-width: 300px;
background: var(--bg-secondary);
border: 1px solid var(--border-subtle);
border-radius: 8px;
box-shadow: 0 8px 24px rgba(0, 0, 0, 0.4);
padding: 12px;
display: flex;
flex-direction: column;
gap: 10px;
}
.popup-header {
display: flex;
justify-content: space-between;
align-items: center;
}
.popup-title {
font-size: 12px;
font-weight: 600;
color: var(--text-primary);
}
.popup-header-actions {
display: flex;
align-items: center;
gap: 6px;
}
.info-trigger {
position: relative;
display: flex;
align-items: center;
color: var(--text-muted);
cursor: help;
}
.info-tooltip {
position: absolute;
bottom: calc(100% + 8px);
right: 0;
width: 260px;
padding: 10px 12px;
background: var(--bg-tertiary);
border: 1px solid var(--border-subtle);
border-radius: 6px;
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.3);
z-index: 10000;
}
.info-tooltip p {
margin: 0;
font-size: 11px;
line-height: 1.5;
color: var(--text-secondary);
}
.info-tooltip p + p {
margin-top: 8px;
}
/* Renderer list */
.renderer-list {
display: flex;
flex-direction: column;
gap: 2px;
}
.renderer-item {
display: flex;
align-items: center;
gap: 8px;
padding: 6px 8px;
border-radius: 6px;
font-size: 12px;
color: var(--text-secondary);
background: transparent;
border: none;
cursor: pointer;
text-align: left;
width: 100%;
transition: background 150ms ease;
}
.renderer-item:hover:not(:disabled) {
background: var(--alpha-6);
}
.renderer-item.active {
background: rgba(234, 179, 8, 0.1);
color: var(--text-primary);
cursor: default;
}
.renderer-item:disabled {
opacity: 0.7;
}
.renderer-icon {
display: flex;
align-items: center;
color: var(--text-muted);
}
.renderer-icon.active {
color: #eab308;
}
.renderer-name {
flex: 1;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.this-device {
font-size: 10px;
color: var(--text-muted);
font-style: italic;
}
.disconnected-message {
font-size: 12px;
color: var(--text-muted);
text-align: center;
padding: 8px 0;
}
/* Footer toggle */
.popup-footer {
border-top: 1px solid var(--alpha-6);
padding-top: 8px;
}
.toggle-btn {
display: flex;
align-items: center;
gap: 6px;
width: 100%;
padding: 6px 10px;
border-radius: 6px;
font-size: 12px;
font-weight: 500;
cursor: pointer;
border: 1px solid var(--border-subtle);
background: var(--bg-tertiary);
color: var(--text-secondary);
transition: background 150ms ease, color 150ms ease;
}
.toggle-btn:hover:not(:disabled) {
background: var(--alpha-6);
}
.toggle-btn.on {
color: #eab308;
border-color: rgba(234, 179, 8, 0.3);
}
.toggle-btn:disabled {
opacity: 0.5;
cursor: wait;
}
</style>
+53
View File
@@ -1844,5 +1844,58 @@
"qbzRadio": "QBZ Radio",
"qobuzRadio": "Qobuz Radio",
"creating": "Radio wird erstellt..."
},
"qconnect": {
"title": "Qobuz Connect",
"statusConnected": "Verbunden",
"statusDisconnected": "Getrennt",
"turnOn": "Einschalten",
"turnOff": "Ausschalten",
"endpointLabel": "Endpunkt",
"lastErrorLabel": "Letzter Fehler",
"queueStateTitle": "Remote-Warteschlange",
"queueVersionLabel": "Version",
"queueItemsLabel": "Warteschlangeneinträge",
"autoplayModeLabel": "Autoplay",
"autoplayItemsLabel": "Autoplay-Einträge",
"shuffleModeLabel": "Zufallswiedergabe",
"rendererStateTitle": "Renderer",
"playingStateLabel": "Wiedergabestatus",
"volumeLabel": "Lautstärke",
"mutedLabel": "Stumm",
"currentTrackLabel": "Aktueller Titel",
"nextTrackLabel": "Nächster Titel",
"positionMsLabel": "Position (ms)",
"queuePreviewTitle": "Warteschlangenvorschau",
"notAvailable": "N/V",
"devDiagnosticsTitle": "Entwicklerdiagnose",
"diagnosticsEmpty": "Noch keine Ereignisse.",
"copyLogs": "Protokolle kopieren",
"clearLogs": "Protokolle löschen",
"logsCopied": "Qobuz Connect Protokolle kopiert",
"admissionBlockedLocalLibrary": "Lokale Bibliothekstitel können nicht an die Qobuz Connect-Warteschlange gesendet werden.",
"admissionBlockedPlex": "Plex-Titel können nicht an die Qobuz Connect-Warteschlange gesendet werden.",
"admissionBlockedUnknown": "Titelquelle ist nicht für die Qobuz Connect-Warteschlange geeignet.",
"admissionCheckFailed": "Qobuz Connect-Warteschlangenprüfung konnte nicht validiert werden.",
"handoffContinueLocallyHint": "Lokale Wiedergabe fortsetzen oder streambare Qobuz-Titel zum Senden auswählen.",
"streamNotEligible": "Dieser Titel ist nicht für die Qobuz Connect-Warteschlange geeignet.",
"remoteQueuedNext": "In Qobuz Connect zur nächsten Wiedergabe eingereiht.",
"remoteQueuedLater": "Zur Qobuz Connect-Warteschlange hinzugefügt.",
"remoteQueueFailed": "Aktualisierung der Qobuz Connect-Warteschlange fehlgeschlagen.",
"sessionTitle": "Sitzung",
"sessionUuid": "Sitzungs-UUID",
"activeRenderer": "Aktiver Renderer",
"renderersLabel": "Renderer",
"noRenderers": "Keine Renderer",
"controllerTitle": "Steuerung",
"play": "Wiedergabe",
"pause": "Pause",
"stop": "Stopp",
"muteLabel": "Stumm",
"unmuteLabel": "Ton an",
"setActiveRenderer": "Als aktiv setzen",
"thisDevice": "Dieses Gerät",
"experimentalWarning": "Qobuz Connect ist experimentell. Fehler sind wahrscheinlich — bitte melden Sie diese im entsprechenden Bereich.",
"localLibraryWarning": "Während Qobuz Connect aktiv ist, ist die lokale Bibliothek nicht kompatibel, da Qobuz Connect keine Nicht-Qobuz-Inhalte unterstützt."
}
}
+3 -1
View File
@@ -2094,7 +2094,9 @@
"muteLabel": "Mute",
"unmuteLabel": "Unmute",
"setActiveRenderer": "Set as active",
"thisDevice": "This device"
"thisDevice": "This device",
"experimentalWarning": "Qobuz Connect is experimental. Bugs are likely — please report them in the corresponding section.",
"localLibraryWarning": "While Qobuz Connect is active, the local library is not compatible due to Qobuz Connect's incompatibility with non-Qobuz content."
},
"radio": {
"albumRadio": "Album Radio",
+3 -1
View File
@@ -2094,7 +2094,9 @@
"muteLabel": "Silenciar",
"unmuteLabel": "Activar sonido",
"setActiveRenderer": "Establecer como activo",
"thisDevice": "Este dispositivo"
"thisDevice": "Este dispositivo",
"experimentalWarning": "Qobuz Connect es experimental. Es muy probable que haya bugs, si los encuentras repórtalos en la sección correspondiente.",
"localLibraryWarning": "Mientras Qobuz Connect está activo, la biblioteca local no es compatible debido a la incompatibilidad de Qobuz Connect con contenido ajeno a Qobuz."
},
"radio": {
"albumRadio": "Radio del Album",
+53
View File
@@ -1844,5 +1844,58 @@
"qbzRadio": "Radio QBZ",
"qobuzRadio": "Radio Qobuz",
"creating": "Création de la radio..."
},
"qconnect": {
"title": "Qobuz Connect",
"statusConnected": "Connecté",
"statusDisconnected": "Déconnecté",
"turnOn": "Activer",
"turnOff": "Désactiver",
"endpointLabel": "Point d'accès",
"lastErrorLabel": "Dernière erreur",
"queueStateTitle": "File d'attente distante",
"queueVersionLabel": "Version",
"queueItemsLabel": "Éléments de la file",
"autoplayModeLabel": "Lecture auto",
"autoplayItemsLabel": "Éléments autoplay",
"shuffleModeLabel": "Lecture aléatoire",
"rendererStateTitle": "Rendu",
"playingStateLabel": "État de lecture",
"volumeLabel": "Volume",
"mutedLabel": "Muet",
"currentTrackLabel": "Piste actuelle",
"nextTrackLabel": "Piste suivante",
"positionMsLabel": "Position (ms)",
"queuePreviewTitle": "Aperçu de la file",
"notAvailable": "N/D",
"devDiagnosticsTitle": "Diagnostics dev",
"diagnosticsEmpty": "Aucun événement pour le moment.",
"copyLogs": "Copier les journaux",
"clearLogs": "Effacer les journaux",
"logsCopied": "Journaux Qobuz Connect copiés",
"admissionBlockedLocalLibrary": "Les pistes de la bibliothèque locale ne peuvent pas être envoyées à la file Qobuz Connect.",
"admissionBlockedPlex": "Les pistes Plex ne peuvent pas être envoyées à la file Qobuz Connect.",
"admissionBlockedUnknown": "La source de la piste n'est pas éligible pour la file Qobuz Connect.",
"admissionCheckFailed": "Impossible de valider l'admission dans la file Qobuz Connect.",
"handoffContinueLocallyHint": "Continuez la lecture localement ou sélectionnez des pistes Qobuz streamables à envoyer.",
"streamNotEligible": "Cette piste n'est pas éligible pour la file Qobuz Connect.",
"remoteQueuedNext": "Ajouté à Qobuz Connect pour lecture suivante.",
"remoteQueuedLater": "Ajouté à la file Qobuz Connect.",
"remoteQueueFailed": "Échec de la mise à jour de la file Qobuz Connect.",
"sessionTitle": "Session",
"sessionUuid": "UUID de session",
"activeRenderer": "Rendu actif",
"renderersLabel": "Rendus",
"noRenderers": "Aucun rendu",
"controllerTitle": "Contrôleur",
"play": "Lecture",
"pause": "Pause",
"stop": "Arrêt",
"muteLabel": "Muet",
"unmuteLabel": "Son activé",
"setActiveRenderer": "Définir comme actif",
"thisDevice": "Cet appareil",
"experimentalWarning": "Qobuz Connect est expérimental. Des bugs sont probables — veuillez les signaler dans la section correspondante.",
"localLibraryWarning": "Lorsque Qobuz Connect est actif, la bibliothèque locale n'est pas compatible en raison de l'incompatibilité de Qobuz Connect avec le contenu non-Qobuz."
}
}
+53
View File
@@ -2050,5 +2050,58 @@
"qbzRadio": "Rádio QBZ",
"qobuzRadio": "Rádio Qobuz",
"creating": "Criando rádio..."
},
"qconnect": {
"title": "Qobuz Connect",
"statusConnected": "Conectado",
"statusDisconnected": "Desconectado",
"turnOn": "Ligar",
"turnOff": "Desligar",
"endpointLabel": "Endpoint",
"lastErrorLabel": "Último erro",
"queueStateTitle": "Fila remota",
"queueVersionLabel": "Versão",
"queueItemsLabel": "Itens da fila",
"autoplayModeLabel": "Autoplay",
"autoplayItemsLabel": "Itens de autoplay",
"shuffleModeLabel": "Aleatório",
"rendererStateTitle": "Renderer",
"playingStateLabel": "Estado de reprodução",
"volumeLabel": "Volume",
"mutedLabel": "Mudo",
"currentTrackLabel": "Faixa atual",
"nextTrackLabel": "Próxima faixa",
"positionMsLabel": "Posição (ms)",
"queuePreviewTitle": "Pré-visualização da fila",
"notAvailable": "N/D",
"devDiagnosticsTitle": "Diagnósticos dev",
"diagnosticsEmpty": "Nenhum evento ainda.",
"copyLogs": "Copiar logs",
"clearLogs": "Limpar logs",
"logsCopied": "Logs do Qobuz Connect copiados",
"admissionBlockedLocalLibrary": "Faixas da biblioteca local não podem ser enviadas para a fila do Qobuz Connect.",
"admissionBlockedPlex": "Faixas do Plex não podem ser enviadas para a fila do Qobuz Connect.",
"admissionBlockedUnknown": "A fonte da faixa não é elegível para a fila do Qobuz Connect.",
"admissionCheckFailed": "Não foi possível validar a admissão na fila do Qobuz Connect.",
"handoffContinueLocallyHint": "Continue a reprodução localmente ou selecione faixas Qobuz para enviar.",
"streamNotEligible": "Esta faixa não é elegível para a fila do Qobuz Connect.",
"remoteQueuedNext": "Adicionado ao Qobuz Connect para reprodução seguinte.",
"remoteQueuedLater": "Adicionado à fila do Qobuz Connect.",
"remoteQueueFailed": "Falha ao atualizar a fila do Qobuz Connect.",
"sessionTitle": "Sessão",
"sessionUuid": "UUID da sessão",
"activeRenderer": "Renderer ativo",
"renderersLabel": "Renderers",
"noRenderers": "Sem renderers",
"controllerTitle": "Controlador",
"play": "Reproduzir",
"pause": "Pausar",
"stop": "Parar",
"muteLabel": "Mudo",
"unmuteLabel": "Ativar som",
"setActiveRenderer": "Definir como ativo",
"thisDevice": "Este dispositivo",
"experimentalWarning": "Qobuz Connect é experimental. Bugs são prováveis — por favor reporte-os na seção correspondente.",
"localLibraryWarning": "Enquanto o Qobuz Connect estiver ativo, a biblioteca local não é compatível devido à incompatibilidade do Qobuz Connect com conteúdo não-Qobuz."
}
}
+6
View File
@@ -5549,6 +5549,9 @@
}
}}
explicit={currentTrack?.parental_warning === true}
qconnectSessionSnapshot={qobuzConnectSessionSnapshot}
onToggleQconnectConnection={handleQobuzConnectButton}
qconnectBusy={qobuzConnectBusy}
/>
{:else}
<NowPlayingBar
@@ -5566,6 +5569,9 @@
{volume}
onVolumeChange={handleVolumeChange}
controlsDisabled={queue.length === 0}
qconnectSessionSnapshot={qobuzConnectSessionSnapshot}
onToggleQconnectConnection={handleQobuzConnectButton}
qconnectBusy={qobuzConnectBusy}
/>
{/if}