Merge branch 'feat/home-accessories-customization'

# Conflicts:
#	config/dot/quickshell/config/qmldir
#	config/dot/quickshell/services/SystemSettings.qml
#	tests/quickshell/settings-pages-contract.sh
This commit is contained in:
Gabriel Brown
2026-08-17 23:31:33 -04:00
36 changed files with 3539 additions and 452 deletions
+23 -3
View File
@@ -85,7 +85,7 @@ ShellRoot {
IntelligenceResult {}
ActivityPanel {}
PowerMenu {}
SettingsWindow {}
SettingsWindow { id: settingsWindow }
// Toasts are their own always-on layer; they must be able to appear
// without any overlay being open.
@@ -258,14 +258,27 @@ ShellRoot {
function fixture(name: string): void { HomeAssistant.applyFixture(name); }
function reset(): void { HomeAssistant.clearFixture(); }
function refresh(): void { HomeAssistant.refresh(); }
function brightness(id: string, percent: int): void { HomeAssistant.setBrightness(id, percent); }
function toggle(id: string): void { HomeAssistant.toggleEntity(id); }
function status(): string {
return JSON.stringify({
fixture: HomeAssistant.fixtureMode,
phase: HomeAssistant.phase,
discoveredCount: HomeAssistant.discoveredCount,
configuredCount: HomeAssistant.configuredCount,
visibleCount: HomeAssistant.visibleEntities.length,
selectedIds: HomeAssistant.selectedEntities.map(entity => entity.id),
entities: HomeAssistant.selectedEntities,
stale: HomeAssistant.stale,
busy: HomeAssistant.busyEntityId !== "",
busy: HomeAssistant.busyEntityIds.length > 0,
busyEntityIds: HomeAssistant.busyEntityIds,
pendingBrightness: HomeAssistant.pendingBrightness,
entityErrors: HomeAssistant.entityErrors,
actionProcessRunning: HomeAssistant.actionProcessRunning,
actionStreamFinished: HomeAssistant.actionStreamFinished,
fixtureTransitionDraining: HomeAssistant.fixtureTransitionDraining,
queuedActionCount: HomeAssistant.actionQueue.length,
actionActive: HomeAssistant.activeAction !== null,
lastError: HomeAssistant.lastError
});
}
@@ -278,7 +291,13 @@ ShellRoot {
function close(): void { ShellState.closeSettings(); }
function page(name: string): void { ShellState.openSettings(name); }
function status(): string {
return JSON.stringify({ open: ShellState.settingsOpen, page: ShellState.settingsPage });
return JSON.stringify({
open: ShellState.settingsOpen,
page: ShellState.settingsPage,
discoveredCount: HomeAssistant.discoveredCount,
selectedCount: HomeAssistant.configuredCount,
homePhone: settingsWindow.homePhoneDiagnostics
});
}
}
@@ -293,6 +312,7 @@ ShellRoot {
autoHdr: SystemSettings.autoHdr,
vrrPolicy: SystemSettings.vrrPolicy,
directScanoutPolicy: SystemSettings.directScanoutPolicy,
bluebubblesAvailable: SystemSettings.bluebubblesAvailable,
busy: SystemSettings.busy,
lastError: SystemSettings.lastError
});