Skip to content

armgit / cindy

Public Imported from GitHub
0

Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。

feat(desktop): 扩充壁纸图库并采用紧凑预览

kirozeng931af6960277
diff --git a/apps/desktop/src/renderer/assets/wallpapers/amber-light.webp b/apps/desktop/src/renderer/assets/wallpapers/amber-light.webp
new file mode 100644
index 0000000000..b305e76eec
Binary files /dev/null and b/apps/desktop/src/renderer/assets/wallpapers/amber-light.webp differ
diff --git a/apps/desktop/src/renderer/assets/wallpapers/blue-gaze.webp b/apps/desktop/src/renderer/assets/wallpapers/blue-gaze.webp
new file mode 100644
index 0000000000..6a810c4f61
Binary files /dev/null and b/apps/desktop/src/renderer/assets/wallpapers/blue-gaze.webp differ
diff --git a/apps/desktop/src/renderer/assets/wallpapers/blush-leaves.webp b/apps/desktop/src/renderer/assets/wallpapers/blush-leaves.webp
new file mode 100644
index 0000000000..e3db0ca893
Binary files /dev/null and b/apps/desktop/src/renderer/assets/wallpapers/blush-leaves.webp differ
diff --git a/apps/desktop/src/renderer/assets/wallpapers/cindy-crimson.webp b/apps/desktop/src/renderer/assets/wallpapers/cindy-crimson.webp
new file mode 100644
index 0000000000..24295c385b
Binary files /dev/null and b/apps/desktop/src/renderer/assets/wallpapers/cindy-crimson.webp differ
diff --git a/apps/desktop/src/renderer/assets/wallpapers/cindy-neon.webp b/apps/desktop/src/renderer/assets/wallpapers/cindy-neon.webp
new file mode 100644
index 0000000000..f09615419e
Binary files /dev/null and b/apps/desktop/src/renderer/assets/wallpapers/cindy-neon.webp differ
diff --git a/apps/desktop/src/renderer/assets/wallpapers/cindy-night-glance.webp b/apps/desktop/src/renderer/assets/wallpapers/cindy-night-glance.webp
new file mode 100644
index 0000000000..4b11f5c1a8
Binary files /dev/null and b/apps/desktop/src/renderer/assets/wallpapers/cindy-night-glance.webp differ
diff --git a/apps/desktop/src/renderer/assets/wallpapers/cindy-prism.webp b/apps/desktop/src/renderer/assets/wallpapers/cindy-prism.webp
new file mode 100644
index 0000000000..1d6cafdd8e
Binary files /dev/null and b/apps/desktop/src/renderer/assets/wallpapers/cindy-prism.webp differ
diff --git a/apps/desktop/src/renderer/assets/wallpapers/cindy-scarlet-stroll.webp b/apps/desktop/src/renderer/assets/wallpapers/cindy-scarlet-stroll.webp
new file mode 100644
index 0000000000..0a285a19a8
Binary files /dev/null and b/apps/desktop/src/renderer/assets/wallpapers/cindy-scarlet-stroll.webp differ
diff --git a/apps/desktop/src/renderer/assets/wallpapers/cindy-whisper.webp b/apps/desktop/src/renderer/assets/wallpapers/cindy-whisper.webp
new file mode 100644
index 0000000000..495a402c29
Binary files /dev/null and b/apps/desktop/src/renderer/assets/wallpapers/cindy-whisper.webp differ
diff --git a/apps/desktop/src/renderer/assets/wallpapers/cloud-roaming.webp b/apps/desktop/src/renderer/assets/wallpapers/cloud-roaming.webp
new file mode 100644
index 0000000000..c6e09896db
Binary files /dev/null and b/apps/desktop/src/renderer/assets/wallpapers/cloud-roaming.webp differ
diff --git a/apps/desktop/src/renderer/assets/wallpapers/dawn-arc.webp b/apps/desktop/src/renderer/assets/wallpapers/dawn-arc.webp
new file mode 100644
index 0000000000..f185ccb570
Binary files /dev/null and b/apps/desktop/src/renderer/assets/wallpapers/dawn-arc.webp differ
diff --git a/apps/desktop/src/renderer/assets/wallpapers/dune-dawn.webp b/apps/desktop/src/renderer/assets/wallpapers/dune-dawn.webp
new file mode 100644
index 0000000000..daefa1f268
Binary files /dev/null and b/apps/desktop/src/renderer/assets/wallpapers/dune-dawn.webp differ
diff --git a/apps/desktop/src/renderer/assets/wallpapers/dune-sphere.webp b/apps/desktop/src/renderer/assets/wallpapers/dune-sphere.webp
new file mode 100644
index 0000000000..84157e861b
Binary files /dev/null and b/apps/desktop/src/renderer/assets/wallpapers/dune-sphere.webp differ
diff --git a/apps/desktop/src/renderer/assets/wallpapers/indigo-folds.webp b/apps/desktop/src/renderer/assets/wallpapers/indigo-folds.webp
new file mode 100644
index 0000000000..44e6d73717
Binary files /dev/null and b/apps/desktop/src/renderer/assets/wallpapers/indigo-folds.webp differ
diff --git a/apps/desktop/src/renderer/assets/wallpapers/moon-solitude.webp b/apps/desktop/src/renderer/assets/wallpapers/moon-solitude.webp
new file mode 100644
index 0000000000..7f4cb55802
Binary files /dev/null and b/apps/desktop/src/renderer/assets/wallpapers/moon-solitude.webp differ
diff --git a/apps/desktop/src/renderer/assets/wallpapers/neon-valley.webp b/apps/desktop/src/renderer/assets/wallpapers/neon-valley.webp
new file mode 100644
index 0000000000..ac1930fac8
Binary files /dev/null and b/apps/desktop/src/renderer/assets/wallpapers/neon-valley.webp differ
diff --git a/apps/desktop/src/renderer/assets/wallpapers/night-launch.webp b/apps/desktop/src/renderer/assets/wallpapers/night-launch.webp
new file mode 100644
index 0000000000..9a24607768
Binary files /dev/null and b/apps/desktop/src/renderer/assets/wallpapers/night-launch.webp differ
diff --git a/apps/desktop/src/renderer/assets/wallpapers/ocean-clouds.webp b/apps/desktop/src/renderer/assets/wallpapers/ocean-clouds.webp
new file mode 100644
index 0000000000..991b43ff14
Binary files /dev/null and b/apps/desktop/src/renderer/assets/wallpapers/ocean-clouds.webp differ
diff --git a/apps/desktop/src/renderer/assets/wallpapers/planet-dawn.webp b/apps/desktop/src/renderer/assets/wallpapers/planet-dawn.webp
new file mode 100644
index 0000000000..332bb05b49
Binary files /dev/null and b/apps/desktop/src/renderer/assets/wallpapers/planet-dawn.webp differ
diff --git a/apps/desktop/src/renderer/assets/wallpapers/rose-quartz.webp b/apps/desktop/src/renderer/assets/wallpapers/rose-quartz.webp
new file mode 100644
index 0000000000..67627d3b2a
Binary files /dev/null and b/apps/desktop/src/renderer/assets/wallpapers/rose-quartz.webp differ
diff --git a/apps/desktop/src/renderer/assets/wallpapers/silent-circuit.webp b/apps/desktop/src/renderer/assets/wallpapers/silent-circuit.webp
new file mode 100644
index 0000000000..de960529fe
Binary files /dev/null and b/apps/desktop/src/renderer/assets/wallpapers/silent-circuit.webp differ
diff --git a/apps/desktop/src/renderer/assets/wallpapers/silent-orbits.webp b/apps/desktop/src/renderer/assets/wallpapers/silent-orbits.webp
new file mode 100644
index 0000000000..6bcecbac32
Binary files /dev/null and b/apps/desktop/src/renderer/assets/wallpapers/silent-orbits.webp differ
diff --git a/apps/desktop/src/renderer/assets/wallpapers/silver-veins.webp b/apps/desktop/src/renderer/assets/wallpapers/silver-veins.webp
new file mode 100644
index 0000000000..6bc2065e08
Binary files /dev/null and b/apps/desktop/src/renderer/assets/wallpapers/silver-veins.webp differ
diff --git a/apps/desktop/src/renderer/assets/wallpapers/stardust-vortex.webp b/apps/desktop/src/renderer/assets/wallpapers/stardust-vortex.webp
new file mode 100644
index 0000000000..469297acbc
Binary files /dev/null and b/apps/desktop/src/renderer/assets/wallpapers/stardust-vortex.webp differ
diff --git a/apps/desktop/src/renderer/assets/wallpapers/teacup-cat.webp b/apps/desktop/src/renderer/assets/wallpapers/teacup-cat.webp
new file mode 100644
index 0000000000..1ac7c99ef2
Binary files /dev/null and b/apps/desktop/src/renderer/assets/wallpapers/teacup-cat.webp differ
diff --git a/apps/desktop/src/renderer/assets/wallpapers/thumbnails/amber-light.webp b/apps/desktop/src/renderer/assets/wallpapers/thumbnails/amber-light.webp
new file mode 100644
index 0000000000..c9161b8607
Binary files /dev/null and b/apps/desktop/src/renderer/assets/wallpapers/thumbnails/amber-light.webp differ
diff --git a/apps/desktop/src/renderer/assets/wallpapers/thumbnails/blue-gaze.webp b/apps/desktop/src/renderer/assets/wallpapers/thumbnails/blue-gaze.webp
new file mode 100644
index 0000000000..d290a1bc59
Binary files /dev/null and b/apps/desktop/src/renderer/assets/wallpapers/thumbnails/blue-gaze.webp differ
diff --git a/apps/desktop/src/renderer/assets/wallpapers/thumbnails/blush-leaves.webp b/apps/desktop/src/renderer/assets/wallpapers/thumbnails/blush-leaves.webp
new file mode 100644
index 0000000000..32821d9d3e
Binary files /dev/null and b/apps/desktop/src/renderer/assets/wallpapers/thumbnails/blush-leaves.webp differ
diff --git a/apps/desktop/src/renderer/assets/wallpapers/thumbnails/cindy-crimson.webp b/apps/desktop/src/renderer/assets/wallpapers/thumbnails/cindy-crimson.webp
new file mode 100644
index 0000000000..57c73a008f
Binary files /dev/null and b/apps/desktop/src/renderer/assets/wallpapers/thumbnails/cindy-crimson.webp differ
diff --git a/apps/desktop/src/renderer/assets/wallpapers/thumbnails/cindy-neon.webp b/apps/desktop/src/renderer/assets/wallpapers/thumbnails/cindy-neon.webp
new file mode 100644
index 0000000000..1b7bea8d51
Binary files /dev/null and b/apps/desktop/src/renderer/assets/wallpapers/thumbnails/cindy-neon.webp differ
diff --git a/apps/desktop/src/renderer/assets/wallpapers/thumbnails/cindy-night-glance.webp b/apps/desktop/src/renderer/assets/wallpapers/thumbnails/cindy-night-glance.webp
new file mode 100644
index 0000000000..009f68ba06
Binary files /dev/null and b/apps/desktop/src/renderer/assets/wallpapers/thumbnails/cindy-night-glance.webp differ
diff --git a/apps/desktop/src/renderer/assets/wallpapers/thumbnails/cindy-prism.webp b/apps/desktop/src/renderer/assets/wallpapers/thumbnails/cindy-prism.webp
new file mode 100644
index 0000000000..30f1e3c063
Binary files /dev/null and b/apps/desktop/src/renderer/assets/wallpapers/thumbnails/cindy-prism.webp differ
diff --git a/apps/desktop/src/renderer/assets/wallpapers/thumbnails/cindy-scarlet-stroll.webp b/apps/desktop/src/renderer/assets/wallpapers/thumbnails/cindy-scarlet-stroll.webp
new file mode 100644
index 0000000000..cfdd6ad2c2
Binary files /dev/null and b/apps/desktop/src/renderer/assets/wallpapers/thumbnails/cindy-scarlet-stroll.webp differ
diff --git a/apps/desktop/src/renderer/assets/wallpapers/thumbnails/cindy-whisper.webp b/apps/desktop/src/renderer/assets/wallpapers/thumbnails/cindy-whisper.webp
new file mode 100644
index 0000000000..de238de014
Binary files /dev/null and b/apps/desktop/src/renderer/assets/wallpapers/thumbnails/cindy-whisper.webp differ
diff --git a/apps/desktop/src/renderer/assets/wallpapers/thumbnails/cloud-roaming.webp b/apps/desktop/src/renderer/assets/wallpapers/thumbnails/cloud-roaming.webp
new file mode 100644
index 0000000000..2f790e31e6
Binary files /dev/null and b/apps/desktop/src/renderer/assets/wallpapers/thumbnails/cloud-roaming.webp differ
diff --git a/apps/desktop/src/renderer/assets/wallpapers/thumbnails/dawn-arc.webp b/apps/desktop/src/renderer/assets/wallpapers/thumbnails/dawn-arc.webp
new file mode 100644
index 0000000000..a198f5c035
Binary files /dev/null and b/apps/desktop/src/renderer/assets/wallpapers/thumbnails/dawn-arc.webp differ
diff --git a/apps/desktop/src/renderer/assets/wallpapers/thumbnails/dune-dawn.webp b/apps/desktop/src/renderer/assets/wallpapers/thumbnails/dune-dawn.webp
new file mode 100644
index 0000000000..d719277136
Binary files /dev/null and b/apps/desktop/src/renderer/assets/wallpapers/thumbnails/dune-dawn.webp differ
diff --git a/apps/desktop/src/renderer/assets/wallpapers/thumbnails/dune-sphere.webp b/apps/desktop/src/renderer/assets/wallpapers/thumbnails/dune-sphere.webp
new file mode 100644
index 0000000000..bc0246209c
Binary files /dev/null and b/apps/desktop/src/renderer/assets/wallpapers/thumbnails/dune-sphere.webp differ
diff --git a/apps/desktop/src/renderer/assets/wallpapers/thumbnails/indigo-folds.webp b/apps/desktop/src/renderer/assets/wallpapers/thumbnails/indigo-folds.webp
new file mode 100644
index 0000000000..8b0ae5d066
Binary files /dev/null and b/apps/desktop/src/renderer/assets/wallpapers/thumbnails/indigo-folds.webp differ
diff --git a/apps/desktop/src/renderer/assets/wallpapers/thumbnails/moon-solitude.webp b/apps/desktop/src/renderer/assets/wallpapers/thumbnails/moon-solitude.webp
new file mode 100644
index 0000000000..9a78cf39e5
Binary files /dev/null and b/apps/desktop/src/renderer/assets/wallpapers/thumbnails/moon-solitude.webp differ
diff --git a/apps/desktop/src/renderer/assets/wallpapers/thumbnails/neon-valley.webp b/apps/desktop/src/renderer/assets/wallpapers/thumbnails/neon-valley.webp
new file mode 100644
index 0000000000..766a87e825
Binary files /dev/null and b/apps/desktop/src/renderer/assets/wallpapers/thumbnails/neon-valley.webp differ
diff --git a/apps/desktop/src/renderer/assets/wallpapers/thumbnails/night-launch.webp b/apps/desktop/src/renderer/assets/wallpapers/thumbnails/night-launch.webp
new file mode 100644
index 0000000000..6418f6c238
Binary files /dev/null and b/apps/desktop/src/renderer/assets/wallpapers/thumbnails/night-launch.webp differ
diff --git a/apps/desktop/src/renderer/assets/wallpapers/thumbnails/ocean-clouds.webp b/apps/desktop/src/renderer/assets/wallpapers/thumbnails/ocean-clouds.webp
new file mode 100644
index 0000000000..78b448584f
Binary files /dev/null and b/apps/desktop/src/renderer/assets/wallpapers/thumbnails/ocean-clouds.webp differ
diff --git a/apps/desktop/src/renderer/assets/wallpapers/thumbnails/planet-dawn.webp b/apps/desktop/src/renderer/assets/wallpapers/thumbnails/planet-dawn.webp
new file mode 100644
index 0000000000..e61b40b109
Binary files /dev/null and b/apps/desktop/src/renderer/assets/wallpapers/thumbnails/planet-dawn.webp differ
diff --git a/apps/desktop/src/renderer/assets/wallpapers/thumbnails/rose-quartz.webp b/apps/desktop/src/renderer/assets/wallpapers/thumbnails/rose-quartz.webp
new file mode 100644
index 0000000000..e853125f18
Binary files /dev/null and b/apps/desktop/src/renderer/assets/wallpapers/thumbnails/rose-quartz.webp differ
diff --git a/apps/desktop/src/renderer/assets/wallpapers/thumbnails/silent-circuit.webp b/apps/desktop/src/renderer/assets/wallpapers/thumbnails/silent-circuit.webp
new file mode 100644
index 0000000000..57f4c60873
Binary files /dev/null and b/apps/desktop/src/renderer/assets/wallpapers/thumbnails/silent-circuit.webp differ
diff --git a/apps/desktop/src/renderer/assets/wallpapers/thumbnails/silent-orbits.webp b/apps/desktop/src/renderer/assets/wallpapers/thumbnails/silent-orbits.webp
new file mode 100644
index 0000000000..cff693ed5c
Binary files /dev/null and b/apps/desktop/src/renderer/assets/wallpapers/thumbnails/silent-orbits.webp differ
diff --git a/apps/desktop/src/renderer/assets/wallpapers/thumbnails/silver-veins.webp b/apps/desktop/src/renderer/assets/wallpapers/thumbnails/silver-veins.webp
new file mode 100644
index 0000000000..251be9b306
Binary files /dev/null and b/apps/desktop/src/renderer/assets/wallpapers/thumbnails/silver-veins.webp differ
diff --git a/apps/desktop/src/renderer/assets/wallpapers/thumbnails/stardust-vortex.webp b/apps/desktop/src/renderer/assets/wallpapers/thumbnails/stardust-vortex.webp
new file mode 100644
index 0000000000..412dcf3886
Binary files /dev/null and b/apps/desktop/src/renderer/assets/wallpapers/thumbnails/stardust-vortex.webp differ
diff --git a/apps/desktop/src/renderer/assets/wallpapers/thumbnails/teacup-cat.webp b/apps/desktop/src/renderer/assets/wallpapers/thumbnails/teacup-cat.webp
new file mode 100644
index 0000000000..38be503cbc
Binary files /dev/null and b/apps/desktop/src/renderer/assets/wallpapers/thumbnails/teacup-cat.webp differ
diff --git a/apps/desktop/src/renderer/assets/wallpapers/thumbnails/tidal-lines.webp b/apps/desktop/src/renderer/assets/wallpapers/thumbnails/tidal-lines.webp
new file mode 100644
index 0000000000..0ef95cd15c
Binary files /dev/null and b/apps/desktop/src/renderer/assets/wallpapers/thumbnails/tidal-lines.webp differ
diff --git a/apps/desktop/src/renderer/assets/wallpapers/thumbnails/wheatfield-watch.webp b/apps/desktop/src/renderer/assets/wallpapers/thumbnails/wheatfield-watch.webp
new file mode 100644
index 0000000000..e746747f76
Binary files /dev/null and b/apps/desktop/src/renderer/assets/wallpapers/thumbnails/wheatfield-watch.webp differ
diff --git a/apps/desktop/src/renderer/assets/wallpapers/thumbnails/white-wilderness.webp b/apps/desktop/src/renderer/assets/wallpapers/thumbnails/white-wilderness.webp
new file mode 100644
index 0000000000..f64033d020
Binary files /dev/null and b/apps/desktop/src/renderer/assets/wallpapers/thumbnails/white-wilderness.webp differ
diff --git a/apps/desktop/src/renderer/assets/wallpapers/tidal-lines.webp b/apps/desktop/src/renderer/assets/wallpapers/tidal-lines.webp
new file mode 100644
index 0000000000..4a6b501b3e
Binary files /dev/null and b/apps/desktop/src/renderer/assets/wallpapers/tidal-lines.webp differ
diff --git a/apps/desktop/src/renderer/assets/wallpapers/wheatfield-watch.webp b/apps/desktop/src/renderer/assets/wallpapers/wheatfield-watch.webp
new file mode 100644
index 0000000000..cdf63234f4
Binary files /dev/null and b/apps/desktop/src/renderer/assets/wallpapers/wheatfield-watch.webp differ
diff --git a/apps/desktop/src/renderer/assets/wallpapers/white-wilderness.webp b/apps/desktop/src/renderer/assets/wallpapers/white-wilderness.webp
new file mode 100644
index 0000000000..ed07ab2f7b
Binary files /dev/null and b/apps/desktop/src/renderer/assets/wallpapers/white-wilderness.webp differ
diff --git a/apps/desktop/src/renderer/components/settings/WallpaperSection.tsx b/apps/desktop/src/renderer/components/settings/WallpaperSection.tsx
index 6f8334bd82..826db7f709 100644
--- a/apps/desktop/src/renderer/components/settings/WallpaperSection.tsx
+++ b/apps/desktop/src/renderer/components/settings/WallpaperSection.tsx
@@ -1,33 +1,27 @@
import { useTranslation } from 'react-i18next';
import { RotateCcw, ImagePlus, Film } from 'lucide-react';
-import { useEffect, useCallback, useId, useState } from 'react';
+import { useEffect, useCallback, useState } from 'react';
import { extractIpcError } from '@/utils/ipcError';
+import { DownloadMeter } from './DownloadMeter';
import { Button } from '@/components/ui/button';
import { SegmentedControl } from '@/components/ui/segmented-control';
import { Slider } from '@/components/ui/slider';
+import { Tip } from '@/components/ui/tooltip';
import { cn } from '@/lib/utils';
import { useWallpaperSettings } from '@/hooks/useWallpaperSettings';
-import { getBuiltinWallpaperBackground, isSceneWallpaper } from '@/lib/wallpaper';
+import { getBuiltinWallpaperPreview, isSceneWallpaper } from '@/lib/wallpaper';
import {
APPEARANCE_LIMITS,
DEFAULT_APPEARANCE_SETTINGS,
isCustomWallpaperVideo,
- type WallpaperId,
+ SELECTABLE_WALLPAPER_IDS,
} from '@/../shared/appearanceSettings';
-const WALLPAPER_OPTIONS: Array<{ id: WallpaperId }> = [
- { id: 'none' },
- { id: 'cindy-window' },
- { id: 'cindy-studio' },
- { id: 'cindy-dream' },
-];
-
export function WallpaperSection() {
const { t } = useTranslation();
const [busy, setBusy] = useState(false);
const [error, setError] = useState('');
- const downloadStatusId = useId();
const {
wallpaperId,
wallpaperOverlay,
@@ -61,6 +55,8 @@ export function WallpaperSection() {
};
}, [cancelBlurPreview, previewBlur]);
const customVideo = isCustomWallpaperVideo(customWallpaperUrl);
+ const downloading = isSceneWallpaper(wallpaperId) && downloadPending;
+ const retryable = isSceneWallpaper(wallpaperId) && downloadFailed && !downloadPending;
const chooseWallpaper = async () => {
setBusy(true);
setError('');
@@ -130,115 +126,100 @@ export function WallpaperSection() {
</div>
<div
- className="grid grid-cols-2 gap-3 sm:grid-cols-3 xl:grid-cols-4"
+ className="grid grid-cols-[repeat(auto-fill,minmax(6rem,1fr))] gap-2"
role="radiogroup"
aria-label={t('settings.appearance.wallpaper.aria')}
>
- {[...WALLPAPER_OPTIONS, { id: 'custom' as const }].map((option) => {
- const selected = wallpaperId === option.id;
- const downloading = selected && isSceneWallpaper(option.id) && downloadPending;
- const retryable =
- selected && isSceneWallpaper(option.id) && downloadFailed && !downloadPending;
+ {SELECTABLE_WALLPAPER_IDS.map((id) => {
+ const selected = wallpaperId === id;
+ const label = t('settings.appearance.wallpaper.options.' + id);
const background =
- option.id === 'custom' && customWallpaperUrl && !customVideo
+ id === 'custom' && customWallpaperUrl && !customVideo
? `url("${customWallpaperUrl}")`
- : getBuiltinWallpaperBackground(option.id);
+ : getBuiltinWallpaperPreview(id);
return (
- <button
- key={option.id}
- type="button"
- role="radio"
- aria-checked={selected}
- aria-label={t('settings.appearance.wallpaper.options.' + option.id)}
- aria-busy={downloading || undefined}
- aria-describedby={downloading || retryable ? downloadStatusId : undefined}
- title={retryable ? t('settings.appearance.wallpaper.retryDownload') : undefined}
- disabled={busy}
- onClick={() => {
- if (retryable) retryDownload();
- else if (option.id === 'custom' && !customWallpaperUrl) void chooseWallpaper();
- else setWallpaper(option.id);
- }}
- className={cn(
- 'flex min-w-0 flex-col gap-2 rounded-xl text-left transition-colors',
- 'focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--settings-theme-icon-active)]',
- )}
- >
- <span
+ <Tip key={id} text={label}>
+ <button
+ type="button"
+ role="radio"
+ aria-checked={selected}
+ aria-label={label}
+ disabled={busy}
+ onClick={() =>
+ id === 'custom' && !customWallpaperUrl ? void chooseWallpaper() : setWallpaper(id)
+ }
className={cn(
- 'relative h-16 overflow-hidden rounded-xl border bg-[var(--settings-input-bg)]',
- selected
- ? 'border-2 border-[var(--settings-theme-preview-border-active)]'
- : 'border-[var(--settings-theme-preview-border)]',
+ 'flex min-w-0 flex-col gap-1 rounded-xl text-left transition-colors',
+ 'focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--settings-theme-icon-active)]',
)}
- style={{
- backgroundImage: background,
- backgroundPosition: 'center',
- backgroundRepeat: 'no-repeat',
- backgroundSize: 'cover',
- }}
>
- {option.id === 'custom' && customVideo ? (
- <span className="absolute inset-0 flex items-center justify-center text-[var(--settings-section-sublabel)]">
- <Film size={22} aria-hidden="true" />
- </span>
- ) : null}
- {option.id === 'custom' && !customWallpaperUrl ? (
- <span className="absolute inset-0 flex items-center justify-center text-[var(--settings-section-sublabel)]">
- <ImagePlus size={22} aria-hidden="true" />
- </span>
- ) : null}
- {option.id === 'none' ? (
- <span className="absolute inset-0 flex items-center justify-center text-12 text-[var(--settings-section-sublabel)]">
- {t('settings.appearance.wallpaper.nonePreview')}
- </span>
- ) : null}
- {downloading && (
- <span
- role="progressbar"
- aria-label={t('settings.appearance.wallpaper.downloading')}
- aria-valuemin={0}
- aria-valuemax={100}
- aria-valuenow={Math.round(downloadProgress * 100)}
- className="absolute inset-0"
- >
- <span
- aria-hidden="true"
- className="absolute inset-0 origin-bottom bg-[color-mix(in_srgb,var(--settings-input-bg)_75%,transparent)] transition-transform duration-[var(--motion-fast)] ease-[var(--motion-ease-out)] motion-reduce:transition-none"
- style={{ transform: `scaleY(${downloadProgress})` }}
- />
- <span id={downloadStatusId} className="sr-only">
- {t('settings.appearance.wallpaper.downloading')}
+ <span
+ className={cn(
+ 'relative aspect-video w-full overflow-hidden rounded-xl border bg-[var(--settings-input-bg)]',
+ selected
+ ? 'border-2 border-[var(--settings-theme-preview-border-active)]'
+ : 'border-[var(--settings-theme-preview-border)]',
+ )}
+ style={{
+ backgroundImage: background,
+ backgroundPosition: 'center',
+ backgroundRepeat: 'no-repeat',
+ backgroundSize: 'cover',
+ }}
+ >
+ {id === 'custom' && customVideo ? (
+ <span className="absolute inset-0 flex items-center justify-center text-[var(--settings-section-sublabel)]">
+ <Film size={22} aria-hidden="true" />
</span>
- </span>
- )}
- {retryable && (
- <span
- role="status"
- className="absolute inset-0 flex items-center justify-center bg-[color-mix(in_srgb,var(--settings-input-bg)_75%,transparent)] text-[var(--text-primary)]"
- >
- <RotateCcw size={24} aria-hidden="true" />
- <span id={downloadStatusId} className="sr-only">
- {`${t('settings.appearance.wallpaper.downloadFailed')} ${t('settings.appearance.wallpaper.retryDownload')}`}
+ ) : null}
+ {id === 'custom' && !customWallpaperUrl ? (
+ <span className="absolute inset-0 flex items-center justify-center text-[var(--settings-section-sublabel)]">
+ <ImagePlus size={22} aria-hidden="true" />
</span>
- </span>
- )}
- </span>
- <span
- className={cn(
- 'truncate text-12 font-medium',
- selected
- ? 'text-[var(--settings-theme-label-active)]'
- : 'text-[var(--settings-theme-label)]',
- )}
- >
- {t('settings.appearance.wallpaper.options.' + option.id)}
- </span>
- </button>
+ ) : null}
+ {id === 'none' ? (
+ <span className="absolute inset-0 flex items-center justify-center text-12 text-[var(--settings-section-sublabel)]">
+ {t('settings.appearance.wallpaper.nonePreview')}
+ </span>
+ ) : null}
+ </span>
+ <span
+ className={cn(
+ 'truncate text-12 font-medium',
+ selected
+ ? 'text-[var(--settings-theme-label-active)]'
+ : 'text-[var(--settings-theme-label)]',
+ )}
+ >
+ {label}
+ </span>
+ </button>
+ </Tip>
);
})}
</div>
+ {/* Only the selected CDN scene downloads; the grid stays available while it loads. */}
+ {downloading && (
+ <DownloadMeter
+ progress={{
+ label: t('settings.appearance.wallpaper.downloading'),
+ percent: downloadProgress * 100,
+ }}
+ />
+ )}
+ {retryable && (
+ <div role="status" className="flex items-center justify-between gap-3">
+ <p className="text-12 text-[var(--settings-section-sublabel)]">
+ {t('settings.appearance.wallpaper.downloadFailed')}
+ </p>
+ <Button variant="secondary" type="button" disabled={busy} onClick={retryDownload}>
+ <RotateCcw size={14} aria-hidden="true" />
+ {t('settings.appearance.wallpaper.retryDownload')}
+ </Button>
+ </div>
+ )}
+
<div className="flex flex-wrap items-center gap-3">
<Button
variant="secondary"
diff --git a/apps/desktop/src/renderer/components/settings/__tests__/AppearanceSection.accessibility.test.tsx b/apps/desktop/src/renderer/components/settings/__tests__/AppearanceSection.accessibility.test.tsx
index b96f1d3b86..308c292df6 100644
--- a/apps/desktop/src/renderer/components/settings/__tests__/AppearanceSection.accessibility.test.tsx
+++ b/apps/desktop/src/renderer/components/settings/__tests__/AppearanceSection.accessibility.test.tsx
@@ -123,6 +123,32 @@ describe('AppearanceSection accessibility', () => {
'settings.appearance.wallpaper.options.cindy-window',
'settings.appearance.wallpaper.options.cindy-studio',
'settings.appearance.wallpaper.options.cindy-dream',
+ 'settings.appearance.wallpaper.options.cindy-whisper',
+ 'settings.appearance.wallpaper.options.cindy-crimson',
+ 'settings.appearance.wallpaper.options.cindy-night-glance',
+ 'settings.appearance.wallpaper.options.cindy-scarlet-stroll',
+ 'settings.appearance.wallpaper.options.cindy-neon',
+ 'settings.appearance.wallpaper.options.cindy-prism',
+ 'settings.appearance.wallpaper.options.wheatfield-watch',
+ 'settings.appearance.wallpaper.options.teacup-cat',
+ 'settings.appearance.wallpaper.options.moon-solitude',
+ 'settings.appearance.wallpaper.options.night-launch',
+ 'settings.appearance.wallpaper.options.stardust-vortex',
+ 'settings.appearance.wallpaper.options.silent-orbits',
+ 'settings.appearance.wallpaper.options.dune-dawn',
+ 'settings.appearance.wallpaper.options.planet-dawn',
+ 'settings.appearance.wallpaper.options.neon-valley',
+ 'settings.appearance.wallpaper.options.silent-circuit',
+ 'settings.appearance.wallpaper.options.indigo-folds',
+ 'settings.appearance.wallpaper.options.cloud-roaming',
+ 'settings.appearance.wallpaper.options.dune-sphere',
+ 'settings.appearance.wallpaper.options.ocean-clouds',
+ 'settings.appearance.wallpaper.options.blush-leaves',
+ 'settings.appearance.wallpaper.options.white-wilderness',
+ 'settings.appearance.wallpaper.options.rose-quartz',
+ 'settings.appearance.wallpaper.options.silver-veins',
+ 'settings.appearance.wallpaper.options.dawn-arc',
+ 'settings.appearance.wallpaper.options.tidal-lines',
'settings.appearance.wallpaper.options.custom',
]);
expect(
diff --git a/apps/desktop/src/renderer/components/settings/__tests__/WallpaperSection.download.test.tsx b/apps/desktop/src/renderer/components/settings/__tests__/WallpaperSection.download.test.tsx
index 0cc28fc0b2..148f6a10bf 100644
--- a/apps/desktop/src/renderer/components/settings/__tests__/WallpaperSection.download.test.tsx
+++ b/apps/desktop/src/renderer/components/settings/__tests__/WallpaperSection.download.test.tsx
@@ -3,9 +3,10 @@ import React from 'react';
import { cleanup, fireEvent, render, screen, within } from '@testing-library/react';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import { WallpaperSection } from '../WallpaperSection';
-import { DEFAULT_APPEARANCE_SETTINGS } from '@/../shared/appearanceSettings';
+import { DEFAULT_APPEARANCE_SETTINGS, type WallpaperId } from '@/../shared/appearanceSettings';
const state = vi.hoisted(() => ({
+ id: 'cindy-window' as WallpaperId,
pending: false,
failed: false,
progress: 0,
@@ -16,7 +17,7 @@ vi.mock('react-i18next', () => ({ useTranslation: () => ({ t: (key: string) => k
vi.mock('@/hooks/useWallpaperSettings', () => ({
useWallpaperSettings: () => ({
...DEFAULT_APPEARANCE_SETTINGS,
- wallpaperId: 'cindy-window',
+ wallpaperId: state.id,
visibility: 1,
downloadPending: state.pending,
downloadFailed: state.failed,
@@ -31,6 +32,7 @@ vi.mock('@/hooks/useWallpaperSettings', () => ({
}),
}));
beforeEach(() => {
+ state.id = 'cindy-window';
state.pending = false;
state.failed = false;
state.progress = 0;
@@ -51,74 +53,86 @@ afterEach(() => {
});
describe('wallpaper download feedback', () => {
- it('shows pending work only over the selected thumbnail, then removes it on completion', () => {
+ it('shows progress for the selected CDN wallpaper while keeping its tile visible', () => {
state.pending = true;
const { rerender } = render(<WallpaperSection />);
- const selected = screen.getByRole('radio', {
- name: 'settings.appearance.wallpaper.options.cindy-window',
+ const status = screen.getByRole('progressbar', {
+ name: 'settings.appearance.wallpaper.downloading',
});
- const status = within(selected).getByRole('progressbar');
+ expect(
+ screen
+ .getByRole('radio', {
+ name: 'settings.appearance.wallpaper.options.cindy-window',
+ })
+ .getAttribute('aria-checked'),
+ ).toBe('true');
expect(screen.getAllByRole('progressbar')).toEqual([status]);
expect(status.getAttribute('aria-valuenow')).toBe('0');
- expect(selected.getAttribute('aria-busy')).toBe('true');
- // The status remains available to assistive technology without a visible text row.
- const description = within(status).getByText('settings.appearance.wallpaper.downloading');
- expect(description.classList.contains('sr-only')).toBe(true);
- expect(selected.getAttribute('aria-describedby')).toBe(description.id);
- expect(
- within(
- screen.getByRole('radio', {
- name: 'settings.appearance.wallpaper.options.cindy-studio',
- }),
- ).queryByRole('progressbar'),
- ).toBeNull();
for (const progress of [0.25, 0.75, 1]) {
state.progress = progress;
rerender(<WallpaperSection />);
expect(status.getAttribute('aria-valuenow')).toBe(String(progress * 100));
- const fill = status.querySelector<HTMLElement>('[aria-hidden="true"]')!;
- expect(fill.classList.contains('origin-bottom')).toBe(true);
- expect(fill.style.transform).toBe(`scaleY(${progress})`);
+ expect(
+ within(screen.getByRole('status')).getByText(String(progress * 100) + '%'),
+ ).toBeTruthy();
}
state.pending = false;
rerender(<WallpaperSection />);
expect(screen.queryByRole('status')).toBeNull();
expect(screen.queryByRole('progressbar')).toBeNull();
- expect(selected.hasAttribute('aria-busy')).toBe(false);
- expect(selected.hasAttribute('aria-describedby')).toBe(false);
});
- it('retries from the failed thumbnail while other thumbnails still change the selection', () => {
+ it('keeps manual retry reachable for the selected scene and lets new tiles change selection', () => {
state.failed = true;
const { rerender } = render(<WallpaperSection />);
- const selected = screen.getByRole('radio', {
- name: 'settings.appearance.wallpaper.options.cindy-window',
- });
- expect(within(selected).getByRole('status').textContent).toContain('wallpaper.downloadFailed');
- expect(selected.title).toBe('settings.appearance.wallpaper.retryDownload');
- expect(
- screen.queryByRole('button', { name: 'settings.appearance.wallpaper.retryDownload' }),
- ).toBeNull();
- fireEvent.click(selected);
+ expect(screen.getByRole('status').textContent).toContain('wallpaper.downloadFailed');
+ fireEvent.click(
+ screen.getByRole('button', {
+ name: 'settings.appearance.wallpaper.retryDownload',
+ }),
+ );
expect(state.retry).toHaveBeenCalledOnce();
expect(state.select).not.toHaveBeenCalled();
fireEvent.click(
screen.getByRole('radio', {
- name: 'settings.appearance.wallpaper.options.cindy-studio',
+ name: 'settings.appearance.wallpaper.options.cindy-whisper',
}),
);
- expect(state.select).toHaveBeenCalledWith('cindy-studio');
+ expect(state.select).toHaveBeenCalledWith('cindy-whisper');
expect(state.retry).toHaveBeenCalledOnce();
state.pending = true;
rerender(<WallpaperSection />);
- expect(selected.hasAttribute('title')).toBe(false);
- expect(selected.getAttribute('aria-busy')).toBe('true');
- fireEvent.click(selected);
- expect(state.retry).toHaveBeenCalledOnce();
+ expect(
+ screen.queryByRole('button', {
+ name: 'settings.appearance.wallpaper.retryDownload',
+ }),
+ ).toBeNull();
+ expect(screen.getByRole('progressbar')).toBeTruthy();
state.pending = false;
state.failed = false;
rerender(<WallpaperSection />);
expect(screen.queryByRole('status')).toBeNull();
});
+
+ it('does not show stale CDN feedback over an offline still', () => {
+ state.id = 'cindy-whisper';
+ state.pending = true;
+ state.failed = true;
+ render(<WallpaperSection />);
+ expect(screen.queryByRole('progressbar')).toBeNull();
+ expect(screen.queryByRole('status')).toBeNull();
+ expect(
+ screen.queryByRole('button', {
+ name: 'settings.appearance.wallpaper.retryDownload',
+ }),
+ ).toBeNull();
+ expect(
+ screen
+ .getByRole('radio', {
+ name: 'settings.appearance.wallpaper.options.cindy-whisper',
+ })
+ .getAttribute('aria-checked'),
+ ).toBe('true');
+ });
});
diff --git a/apps/desktop/src/renderer/hooks/__tests__/useWallpaperAsset.test.tsx b/apps/desktop/src/renderer/hooks/__tests__/useWallpaperAsset.test.tsx
index e2e0672da2..a26a110e55 100644
--- a/apps/desktop/src/renderer/hooks/__tests__/useWallpaperAsset.test.tsx
+++ b/apps/desktop/src/renderer/hooks/__tests__/useWallpaperAsset.test.tsx
@@ -2,7 +2,11 @@
import { act, cleanup, renderHook, waitFor } from '@testing-library/react';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import { useWallpaperAsset } from '../useWallpaperAsset';
-import type { WallpaperId, WallpaperDownloadProgress } from '@/../shared/appearanceSettings';
+import {
+ SELECTABLE_WALLPAPER_IDS,
+ type WallpaperId,
+ type WallpaperDownloadProgress,
+} from '@/../shared/appearanceSettings';
import manifest from '@/../shared/wallpaper-video-manifest.json';
const image = vi.fn();
@@ -81,7 +85,7 @@ describe('on-demand wallpaper assets', () => {
unmount();
expect(progressListeners.size).toBe(0);
});
- it('does not fetch absent/custom scenes or disabled video, and requests only the selected image', async () => {
+ it('keeps the current still catalog offline and downloads only selected manifest-backed media', async () => {
const { rerender } = renderHook(
({ id, enabled }: { id: WallpaperId; enabled: boolean }) => {
useWallpaperAsset(id, 'image', true);
@@ -89,7 +93,9 @@ describe('on-demand wallpaper assets', () => {
},
{ initialProps: { id: 'none' as WallpaperId, enabled: false } },
);
- rerender({ id: 'custom', enabled: false });
+ for (const id of SELECTABLE_WALLPAPER_IDS) {
+ if (!Object.hasOwn(manifest, id)) rerender({ id, enabled: true });
+ }
expect(image).not.toHaveBeenCalled();
expect(video).not.toHaveBeenCalled();
rerender({ id: 'cindy-window', enabled: false });
diff --git a/apps/desktop/src/renderer/hooks/__tests__/useWallpaperSettings.test.tsx b/apps/desktop/src/renderer/hooks/__tests__/useWallpaperSettings.test.tsx
index 8d53cc0f61..6240afc935 100644
--- a/apps/desktop/src/renderer/hooks/__tests__/useWallpaperSettings.test.tsx
+++ b/apps/desktop/src/renderer/hooks/__tests__/useWallpaperSettings.test.tsx
@@ -12,6 +12,7 @@ function Controls() {
return (
<>
<button onClick={() => settings.setWallpaper('cindy-window')}>Choose</button>
+ <button onClick={() => settings.setWallpaper('cindy-whisper')}>Choose Still</button>
<button onClick={settings.resetWallpaper}>Reset</button>
<button onClick={() => settings.setMotion('dynamic')}>Animate</button>
<button onClick={() => settings.setMotion('static')}>Static</button>
@@ -40,6 +41,51 @@ afterEach(() => {
});
describe('application wallpaper lifecycle', () => {
+ it('switches from a pending CDN scene to an offline still without using the late download', async () => {
+ let finish!: (url: string) => void;
+ const ensureImage = vi.fn(
+ () =>
+ new Promise<string>((resolve) => {
+ finish = resolve;
+ }),
+ );
+ const ensureVideo = vi.fn();
+ const setPatch = vi.fn().mockResolvedValue(undefined);
+ vi.stubGlobal(
+ 'Image',
+ class {
+ src = '';
+ decode = async () => {};
+ },
+ );
+ vi.stubGlobal('electronAPI', {
+ appearanceSettings: {
+ getSync: () => ({ ...DEFAULT_APPEARANCE_SETTINGS, wallpaperId: 'cindy-window' }),
+ onChanged: () => () => {},
+ setPatch,
+ ensureWallpaperImage: ensureImage,
+ ensureWallpaperVideo: ensureVideo,
+ },
+ });
+ render(
+ <WallpaperSettingsProvider>
+ <Controls />
+ </WallpaperSettingsProvider>,
+ );
+ await waitFor(() => expect(ensureImage).toHaveBeenCalledExactlyOnceWith('cindy-window'));
+ fireEvent.click(screen.getByText('Choose Still'));
+ await waitFor(() =>
+ expect(setPatch).toHaveBeenCalledExactlyOnceWith({ wallpaperId: 'cindy-whisper' }),
+ );
+ const background = () =>
+ document.documentElement.style.getPropertyValue('--app-wallpaper-image');
+ expect(background()).toContain('cindy-whisper.webp');
+ await act(async () => finish(`cindy-media://client-wallpaper/${'a'.repeat(64)}.webp`));
+ expect(background()).toContain('cindy-whisper.webp');
+ expect(ensureImage).toHaveBeenCalledTimes(1);
+ expect(ensureVideo).not.toHaveBeenCalled();
+ });
+
it('weights required image and video progress by bytes, excluding video in static mode', async () => {
const listeners = new Set<(progress: WallpaperDownloadProgress) => void>();
vi.stubGlobal('electronAPI', {
diff --git a/apps/desktop/src/renderer/i18n/locales/en/common.json b/apps/desktop/src/renderer/i18n/locales/en/common.json
index e85ce806c4..6348b86841 100644
--- a/apps/desktop/src/renderer/i18n/locales/en/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/en/common.json
@@ -1665,6 +1665,32 @@
"cindy-window": "Cindy · Window Companion",
"cindy-studio": "Cindy · Future Atelier",
"cindy-dream": "Cindy · Dream Voyage",
+ "cindy-whisper": "Cindy · Whisper",
+ "cindy-crimson": "Cindy · Crimson Realm",
+ "cindy-night-glance": "Cindy · Night Glance",
+ "cindy-scarlet-stroll": "Cindy · Scarlet Stroll",
+ "cindy-neon": "Cindy · Neon Silhouette",
+ "cindy-prism": "Cindy · Prism Shards",
+ "wheatfield-watch": "Wheatfield Watch",
+ "teacup-cat": "Teacup Cat",
+ "cloud-roaming": "Under the Clouds",
+ "night-launch": "Night Launch",
+ "stardust-vortex": "Stardust Vortex",
+ "silent-orbits": "Silent Orbits",
+ "dune-dawn": "Dune Dawn",
+ "planet-dawn": "Planet Dawn",
+ "neon-valley": "Neon Valley",
+ "silent-circuit": "Silent Circuit",
+ "indigo-folds": "Indigo Folds",
+ "moon-solitude": "Moon Gazer",
+ "dune-sphere": "Dune Sphere",
+ "ocean-clouds": "Ocean Clouds",
+ "blush-leaves": "Blush Leaves",
+ "white-wilderness": "White Wilderness",
+ "rose-quartz": "Rose Quartz",
+ "silver-veins": "Silver Veins",
+ "dawn-arc": "Dawn Arc",
+ "tidal-lines": "Tidal Lines",
"custom": "Custom wallpaper"
},
"visibilityLabel": "Wallpaper Visibility",
diff --git a/apps/desktop/src/renderer/i18n/locales/ja/common.json b/apps/desktop/src/renderer/i18n/locales/ja/common.json
index 8298eef2d5..2207d035fc 100644
--- a/apps/desktop/src/renderer/i18n/locales/ja/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/ja/common.json
@@ -1638,6 +1638,32 @@
"cindy-window": "Cindy · 窓辺のひととき",
"cindy-studio": "Cindy · 未来のアトリエ",
"cindy-dream": "Cindy · 夢の旅",
+ "cindy-whisper": "Cindy · ささやき",
+ "cindy-crimson": "Cindy · 深紅の世界",
+ "cindy-night-glance": "Cindy · 夜の振り返り",
+ "cindy-scarlet-stroll": "Cindy · 赤い夜の散歩",
+ "cindy-neon": "Cindy · ネオンの横顔",
+ "cindy-prism": "Cindy · プリズムのかけら",
+ "wheatfield-watch": "麦畑の見守り",
+ "teacup-cat": "カップの黒猫",
+ "cloud-roaming": "雲の下の旅",
+ "night-launch": "夜空への飛翔",
+ "stardust-vortex": "星屑の渦",
+ "silent-orbits": "静かな軌道",
+ "dune-dawn": "砂丘の夜明け",
+ "planet-dawn": "惑星の夜明け",
+ "neon-valley": "ネオンの谷",
+ "silent-circuit": "静かな回路",
+ "indigo-folds": "藍色の重なり",
+ "moon-solitude": "月を望む孤影",
+ "dune-sphere": "砂丘の球体",
+ "ocean-clouds": "海と流れる雲",
+ "blush-leaves": "淡紅の葉影",
+ "white-wilderness": "白原のひとり旅",
+ "rose-quartz": "ローズクォーツ",
+ "silver-veins": "黒岩の銀脈",
+ "dawn-arc": "夜明けの弧",
+ "tidal-lines": "潮の流線",
"custom": "カスタム壁紙"
},
"visibilityLabel": "壁紙の表示濃度",
diff --git a/apps/desktop/src/renderer/i18n/locales/ko/common.json b/apps/desktop/src/renderer/i18n/locales/ko/common.json
index 45928a221d..6f300e4007 100644
--- a/apps/desktop/src/renderer/i18n/locales/ko/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/ko/common.json
@@ -1638,6 +1638,32 @@
"cindy-window": "Cindy · 창가의 휴식",
"cindy-studio": "Cindy · 미래의 아틀리에",
"cindy-dream": "Cindy · 꿈속 여행",
+ "cindy-whisper": "Cindy · 속삭임",
+ "cindy-crimson": "Cindy · 진홍빛 세계",
+ "cindy-night-glance": "Cindy · 밤의 눈길",
+ "cindy-scarlet-stroll": "Cindy · 붉은 밤 산책",
+ "cindy-neon": "Cindy · 네온 옆모습",
+ "cindy-prism": "Cindy · 프리즘 조각",
+ "wheatfield-watch": "밀밭의 파수꾼",
+ "teacup-cat": "찻잔 속 검은 고양이",
+ "cloud-roaming": "구름 아래 여행",
+ "night-launch": "밤하늘로의 비상",
+ "stardust-vortex": "별가루 소용돌이",
+ "silent-orbits": "고요한 궤도",
+ "dune-dawn": "모래 언덕의 새벽",
+ "planet-dawn": "행성의 새벽",
+ "neon-valley": "네온 계곡",
+ "silent-circuit": "고요한 회로",
+ "indigo-folds": "겹겹의 쪽빛",
+ "moon-solitude": "달을 바라보는 그림자",
+ "dune-sphere": "모래 언덕의 구체",
+ "ocean-clouds": "바다 위 흐르는 구름",
+ "blush-leaves": "연분홍 잎 그림자",
+ "white-wilderness": "하얀 들판의 홀로 여행",
+ "rose-quartz": "장미 수정",
+ "silver-veins": "검은 바위의 은빛 결",
+ "dawn-arc": "새벽의 곡선",
+ "tidal-lines": "물결의 선",
"custom": "사용자 지정 배경화면"
},
"visibilityLabel": "배경화면 표시 강도",
diff --git a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
index 66afee23cd..9515a6e2e9 100644
--- a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
@@ -1638,6 +1638,32 @@
"cindy-window": "Cindy · 窗边陪伴",
"cindy-studio": "Cindy · 未来工作室",
"cindy-dream": "Cindy · 梦境漫游",
+ "cindy-whisper": "Cindy · 悄悄话",
+ "cindy-crimson": "Cindy · 绯红之境",
+ "cindy-night-glance": "Cindy · 夜色回眸",
+ "cindy-scarlet-stroll": "Cindy · 赤夜漫步",
+ "cindy-neon": "Cindy · 霓光侧影",
+ "cindy-prism": "Cindy · 棱镜碎光",
+ "wheatfield-watch": "麦田守望",
+ "teacup-cat": "杯中黑猫",
+ "cloud-roaming": "云下远行",
+ "night-launch": "夜航流光",
+ "stardust-vortex": "星尘漩涡",
+ "silent-orbits": "静谧星轨",
+ "dune-dawn": "沙海晨光",
+ "planet-dawn": "星海晨曦",
+ "neon-valley": "霓虹峡谷",
+ "silent-circuit": "静默电路",
+ "indigo-folds": "靛蓝层叠",
+ "moon-solitude": "孤影望月",
+ "dune-sphere": "沙丘圆石",
+ "ocean-clouds": "沧海流云",
+ "blush-leaves": "浅绛疏影",
+ "white-wilderness": "白原孤旅",
+ "rose-quartz": "蔷薇晶矿",
+ "silver-veins": "黛岩银脉",
+ "dawn-arc": "暗界晨弧",
+ "tidal-lines": "潮汐流线",
"custom": "自定义壁纸"
},
"visibilityLabel": "壁纸可见度",
diff --git a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
index 27142cb703..b3baf95d12 100644
--- a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
@@ -1638,6 +1638,32 @@
"cindy-window": "Cindy · 窗邊陪伴",
"cindy-studio": "Cindy · 未來工作室",
"cindy-dream": "Cindy · 夢境漫遊",
+ "cindy-whisper": "Cindy · 悄悄話",
+ "cindy-crimson": "Cindy · 緋紅之境",
+ "cindy-night-glance": "Cindy · 夜色回眸",
+ "cindy-scarlet-stroll": "Cindy · 赤夜漫步",
+ "cindy-neon": "Cindy · 霓光側影",
+ "cindy-prism": "Cindy · 稜鏡碎光",
+ "wheatfield-watch": "麥田守望",
+ "teacup-cat": "杯中黑貓",
+ "cloud-roaming": "雲下遠行",
+ "night-launch": "夜航流光",
+ "stardust-vortex": "星塵漩渦",
+ "silent-orbits": "靜謐星軌",
+ "dune-dawn": "沙海晨光",
+ "planet-dawn": "星海晨曦",
+ "neon-valley": "霓虹峽谷",
+ "silent-circuit": "靜默電路",
+ "indigo-folds": "靛藍層疊",
+ "moon-solitude": "孤影望月",
+ "dune-sphere": "沙丘圓石",
+ "ocean-clouds": "滄海流雲",
+ "blush-leaves": "淺絳疏影",
+ "white-wilderness": "白原孤旅",
+ "rose-quartz": "薔薇晶礦",
+ "silver-veins": "黛岩銀脈",
+ "dawn-arc": "暗界晨弧",
+ "tidal-lines": "潮汐流線",
"custom": "自訂桌布"
},
"visibilityLabel": "桌布可見度",
diff --git a/apps/desktop/src/renderer/lib/wallpaper.ts b/apps/desktop/src/renderer/lib/wallpaper.ts
index 0f19e786c9..6c51fc9592 100644
--- a/apps/desktop/src/renderer/lib/wallpaper.ts
+++ b/apps/desktop/src/renderer/lib/wallpaper.ts
@@ -1,10 +1,68 @@
import type { WallpaperId } from '@/../shared/appearanceSettings';
+import sceneManifest from '@/../shared/wallpaper-video-manifest.json';
import cindyWindow from '@/assets/wallpapers/previews/cindy-window.webp';
import cindyStudio from '@/assets/wallpapers/previews/cindy-studio.webp';
import cindyDream from '@/assets/wallpapers/previews/cindy-dream.webp';
+import cindyWhisper from '@/assets/wallpapers/cindy-whisper.webp';
+import cindyNeon from '@/assets/wallpapers/cindy-neon.webp';
+import cindyPrism from '@/assets/wallpapers/cindy-prism.webp';
+import cindyCrimson from '@/assets/wallpapers/cindy-crimson.webp';
+import cindyNightGlance from '@/assets/wallpapers/cindy-night-glance.webp';
+import cindyScarletStroll from '@/assets/wallpapers/cindy-scarlet-stroll.webp';
+import cloudRoaming from '@/assets/wallpapers/cloud-roaming.webp';
+import nightLaunch from '@/assets/wallpapers/night-launch.webp';
+import stardustVortex from '@/assets/wallpapers/stardust-vortex.webp';
+import silentOrbits from '@/assets/wallpapers/silent-orbits.webp';
+import duneDawn from '@/assets/wallpapers/dune-dawn.webp';
+import planetDawn from '@/assets/wallpapers/planet-dawn.webp';
+import neonValley from '@/assets/wallpapers/neon-valley.webp';
+import silentCircuit from '@/assets/wallpapers/silent-circuit.webp';
+import indigoFolds from '@/assets/wallpapers/indigo-folds.webp';
+import wheatfieldWatch from '@/assets/wallpapers/wheatfield-watch.webp';
+import moonSolitude from '@/assets/wallpapers/moon-solitude.webp';
+import teacupCat from '@/assets/wallpapers/teacup-cat.webp';
+import duneSphere from '@/assets/wallpapers/dune-sphere.webp';
+import amberLight from '@/assets/wallpapers/amber-light.webp';
+import oceanClouds from '@/assets/wallpapers/ocean-clouds.webp';
+import blushLeaves from '@/assets/wallpapers/blush-leaves.webp';
+import whiteWilderness from '@/assets/wallpapers/white-wilderness.webp';
+import blueGaze from '@/assets/wallpapers/blue-gaze.webp';
+import roseQuartz from '@/assets/wallpapers/rose-quartz.webp';
+import silverVeins from '@/assets/wallpapers/silver-veins.webp';
+import dawnArc from '@/assets/wallpapers/dawn-arc.webp';
+import tidalLines from '@/assets/wallpapers/tidal-lines.webp';
+import cindyWhisperThumbnail from '@/assets/wallpapers/thumbnails/cindy-whisper.webp';
+import cindyNeonThumbnail from '@/assets/wallpapers/thumbnails/cindy-neon.webp';
+import cindyPrismThumbnail from '@/assets/wallpapers/thumbnails/cindy-prism.webp';
+import cindyCrimsonThumbnail from '@/assets/wallpapers/thumbnails/cindy-crimson.webp';
+import cindyNightGlanceThumbnail from '@/assets/wallpapers/thumbnails/cindy-night-glance.webp';
+import cindyScarletStrollThumbnail from '@/assets/wallpapers/thumbnails/cindy-scarlet-stroll.webp';
+import cloudRoamingThumbnail from '@/assets/wallpapers/thumbnails/cloud-roaming.webp';
+import nightLaunchThumbnail from '@/assets/wallpapers/thumbnails/night-launch.webp';
+import stardustVortexThumbnail from '@/assets/wallpapers/thumbnails/stardust-vortex.webp';
+import silentOrbitsThumbnail from '@/assets/wallpapers/thumbnails/silent-orbits.webp';
+import duneDawnThumbnail from '@/assets/wallpapers/thumbnails/dune-dawn.webp';
+import planetDawnThumbnail from '@/assets/wallpapers/thumbnails/planet-dawn.webp';
+import neonValleyThumbnail from '@/assets/wallpapers/thumbnails/neon-valley.webp';
+import silentCircuitThumbnail from '@/assets/wallpapers/thumbnails/silent-circuit.webp';
+import indigoFoldsThumbnail from '@/assets/wallpapers/thumbnails/indigo-folds.webp';
+import wheatfieldWatchThumbnail from '@/assets/wallpapers/thumbnails/wheatfield-watch.webp';
+import moonSolitudeThumbnail from '@/assets/wallpapers/thumbnails/moon-solitude.webp';
+import teacupCatThumbnail from '@/assets/wallpapers/thumbnails/teacup-cat.webp';
+import duneSphereThumbnail from '@/assets/wallpapers/thumbnails/dune-sphere.webp';
+import amberLightThumbnail from '@/assets/wallpapers/thumbnails/amber-light.webp';
+import oceanCloudsThumbnail from '@/assets/wallpapers/thumbnails/ocean-clouds.webp';
+import blushLeavesThumbnail from '@/assets/wallpapers/thumbnails/blush-leaves.webp';
+import whiteWildernessThumbnail from '@/assets/wallpapers/thumbnails/white-wilderness.webp';
+import blueGazeThumbnail from '@/assets/wallpapers/thumbnails/blue-gaze.webp';
+import roseQuartzThumbnail from '@/assets/wallpapers/thumbnails/rose-quartz.webp';
+import silverVeinsThumbnail from '@/assets/wallpapers/thumbnails/silver-veins.webp';
+import dawnArcThumbnail from '@/assets/wallpapers/thumbnails/dawn-arc.webp';
+import tidalLinesThumbnail from '@/assets/wallpapers/thumbnails/tidal-lines.webp';
-export function isSceneWallpaper(id: WallpaperId): id is Exclude<WallpaperId, 'none' | 'custom'> {
- return id === 'cindy-window' || id === 'cindy-studio' || id === 'cindy-dream';
+/** Only manifest-backed scenes use the main-process downloader; local stills stay offline. */
+export function isSceneWallpaper(id: WallpaperId): id is keyof typeof sceneManifest {
+ return Object.hasOwn(sceneManifest, id);
}
/** Decorative artwork; the application applies a theme-derived readability veil. */
@@ -12,8 +70,72 @@ const BUILTIN_WALLPAPER_BACKGROUNDS: Partial<Record<WallpaperId, string>> = {
'cindy-window': `url("${cindyWindow}")`,
'cindy-studio': `url("${cindyStudio}")`,
'cindy-dream': `url("${cindyDream}")`,
+ 'cindy-whisper': `url("${cindyWhisper}")`,
+ 'cindy-neon': `url("${cindyNeon}")`,
+ 'cindy-prism': `url("${cindyPrism}")`,
+ 'cindy-crimson': `url("${cindyCrimson}")`,
+ 'cindy-night-glance': `url("${cindyNightGlance}")`,
+ 'cindy-scarlet-stroll': `url("${cindyScarletStroll}")`,
+ 'cloud-roaming': `url("${cloudRoaming}")`,
+ 'night-launch': `url("${nightLaunch}")`,
+ 'stardust-vortex': `url("${stardustVortex}")`,
+ 'silent-orbits': `url("${silentOrbits}")`,
+ 'dune-dawn': `url("${duneDawn}")`,
+ 'planet-dawn': `url("${planetDawn}")`,
+ 'neon-valley': `url("${neonValley}")`,
+ 'silent-circuit': `url("${silentCircuit}")`,
+ 'indigo-folds': `url("${indigoFolds}")`,
+ 'wheatfield-watch': `url("${wheatfieldWatch}")`,
+ 'moon-solitude': `url("${moonSolitude}")`,
+ 'teacup-cat': `url("${teacupCat}")`,
+ 'dune-sphere': `url("${duneSphere}")`,
+ 'amber-light': `url("${amberLight}")`,
+ 'ocean-clouds': `url("${oceanClouds}")`,
+ 'blush-leaves': `url("${blushLeaves}")`,
+ 'white-wilderness': `url("${whiteWilderness}")`,
+ 'blue-gaze': `url("${blueGaze}")`,
+ 'rose-quartz': `url("${roseQuartz}")`,
+ 'silver-veins': `url("${silverVeins}")`,
+ 'dawn-arc': `url("${dawnArc}")`,
+ 'tidal-lines': `url("${tidalLines}")`,
};
export function getBuiltinWallpaperBackground(id: WallpaperId): string | undefined {
return BUILTIN_WALLPAPER_BACKGROUNDS[id];
}
+
+/** Picker previews avoid decoding every full-resolution still at once. */
+const BUILTIN_WALLPAPER_THUMBNAILS: Partial<Record<WallpaperId, string>> = {
+ 'cindy-whisper': `url("${cindyWhisperThumbnail}")`,
+ 'cindy-neon': `url("${cindyNeonThumbnail}")`,
+ 'cindy-prism': `url("${cindyPrismThumbnail}")`,
+ 'cindy-crimson': `url("${cindyCrimsonThumbnail}")`,
+ 'cindy-night-glance': `url("${cindyNightGlanceThumbnail}")`,
+ 'cindy-scarlet-stroll': `url("${cindyScarletStrollThumbnail}")`,
+ 'cloud-roaming': `url("${cloudRoamingThumbnail}")`,
+ 'night-launch': `url("${nightLaunchThumbnail}")`,
+ 'stardust-vortex': `url("${stardustVortexThumbnail}")`,
+ 'silent-orbits': `url("${silentOrbitsThumbnail}")`,
+ 'dune-dawn': `url("${duneDawnThumbnail}")`,
+ 'planet-dawn': `url("${planetDawnThumbnail}")`,
+ 'neon-valley': `url("${neonValleyThumbnail}")`,
+ 'silent-circuit': `url("${silentCircuitThumbnail}")`,
+ 'indigo-folds': `url("${indigoFoldsThumbnail}")`,
+ 'wheatfield-watch': `url("${wheatfieldWatchThumbnail}")`,
+ 'moon-solitude': `url("${moonSolitudeThumbnail}")`,
+ 'teacup-cat': `url("${teacupCatThumbnail}")`,
+ 'dune-sphere': `url("${duneSphereThumbnail}")`,
+ 'amber-light': `url("${amberLightThumbnail}")`,
+ 'ocean-clouds': `url("${oceanCloudsThumbnail}")`,
+ 'blush-leaves': `url("${blushLeavesThumbnail}")`,
+ 'white-wilderness': `url("${whiteWildernessThumbnail}")`,
+ 'blue-gaze': `url("${blueGazeThumbnail}")`,
+ 'rose-quartz': `url("${roseQuartzThumbnail}")`,
+ 'silver-veins': `url("${silverVeinsThumbnail}")`,
+ 'dawn-arc': `url("${dawnArcThumbnail}")`,
+ 'tidal-lines': `url("${tidalLinesThumbnail}")`,
+};
+
+export function getBuiltinWallpaperPreview(id: WallpaperId): string | undefined {
+ return BUILTIN_WALLPAPER_THUMBNAILS[id] ?? getBuiltinWallpaperBackground(id);
+}
diff --git a/apps/desktop/src/shared/appearanceSettings.ts b/apps/desktop/src/shared/appearanceSettings.ts
index 6162e65c10..4ba216cd40 100644
--- a/apps/desktop/src/shared/appearanceSettings.ts
+++ b/apps/desktop/src/shared/appearanceSettings.ts
@@ -72,13 +72,43 @@ export const APPEARANCE_LIMITS = {
wallpaperBlur: { min: 0, max: 20, step: 1 },
} as const;
-export const WALLPAPER_IDS = [
+/** Current picker order; saved selections also accept the hidden compatibility IDs below. */
+export const SELECTABLE_WALLPAPER_IDS = [
'none',
'cindy-window',
'cindy-studio',
'cindy-dream',
+ 'cindy-whisper',
+ 'cindy-crimson',
+ 'cindy-night-glance',
+ 'cindy-scarlet-stroll',
+ 'cindy-neon',
+ 'cindy-prism',
+ 'wheatfield-watch',
+ 'teacup-cat',
+ 'moon-solitude',
+ 'night-launch',
+ 'stardust-vortex',
+ 'silent-orbits',
+ 'dune-dawn',
+ 'planet-dawn',
+ 'neon-valley',
+ 'silent-circuit',
+ 'indigo-folds',
+ 'cloud-roaming',
+ 'dune-sphere',
+ 'ocean-clouds',
+ 'blush-leaves',
+ 'white-wilderness',
+ 'rose-quartz',
+ 'silver-veins',
+ 'dawn-arc',
+ 'tidal-lines',
'custom',
] as const;
+
+/** Keep already-selected artwork working when a choice is removed from the picker. */
+export const WALLPAPER_IDS = [...SELECTABLE_WALLPAPER_IDS, 'blue-gaze', 'amber-light'] as const;
export type WallpaperId = (typeof WALLPAPER_IDS)[number];
export function normalizeCustomWallpaperUrl(value: unknown): string {
diff --git a/docs/design-rules/DESIGN.md b/docs/design-rules/DESIGN.md
index 6fd05c93f9..ed1842ffd1 100644
--- a/docs/design-rules/DESIGN.md
+++ b/docs/design-rules/DESIGN.md
@@ -76,8 +76,32 @@ align with the same wallpaper instead of introducing an opaque footer rectangle.
Built-in SVG wallpapers are decorative assets, not new semantic UI colors.
Verify actual Light/Dark screenshots across host pages and the expanded tool pane.
-The built-in wallpaper catalog contains only Window Companion, Future Atelier and Dream
-Wander, plus None to restore the theme canvas (user decision, 2026-10-01).
+The built-in picker retains Window Companion, Future Atelier and Dream Wander,
+with their Static / Dynamic choice, alongside 26 supplied still images: character,
+cat, landscape, space and abstract artworks (user curation, 2026-10-16). The supplied
+stills ship as metadata-free WebP at their source resolution, with separate lightweight
+thumbnails. Blue Gaze and Amber Light are hidden from the picker.
+Previously saved selections keep their artwork and motion behavior;
+removing a catalog choice does not rewrite appearance preferences or delete source images.
+The original three scenes retain mainline on-demand image/video downloads, verified
+cache reuse, and preview fallback. Their download progress and retry action appear
+below the grid when needed while the thumbnails remain available for selection.
+Reuse the settings DownloadMeter; keep all new stills offline
+and do not request CDN assets for IDs absent from the download manifest.
+The original three scenes lead the Cindy group, followed by Whisper, Crimson Realm, Night Glance, Scarlet Stroll,
+Neon Silhouette, Prism Shards, followed by the two cat wallpapers Wheatfield Watch
+and Teacup Cat. Other artwork follows this group; Moon Gazer (formerly Giant Moon Platform) sits
+directly after the two cat wallpapers, and Cloud Roaming follows Indigo Folds. Six
+supplied stills were dropped from the picker before release (Palm Shadows, Dusk Arrow,
+Rainy Stop, Window Rest, Golden Tides, Forest River) and are not shipped.
+The new artwork uses the existing continuous cover fit, theme-derived visibility
+and blur controls. None remains the default and restores the theme canvas.
+The picker remains an inline compact grid (user choice, 2026-10-15): use
+container-width-driven columns with a 6rem minimum, 8px grid gaps, 16:9 previews,
+and a 4px gap before each readable name. At the standard 1280px window width this
+shows eight columns; narrower windows naturally show fewer. Keep direct click-to-apply
+selection, the existing selected/focus treatment, and full names in accessible labels
+and hover/focus tooltips when the visible label is truncated.
Custom wallpaper is available through Choose Wallpaper, Replace Wallpaper and Remove Wallpaper
in the same section (user addition, 2026-10-01; video support, 2026-10-05). Accept local PNG/JPEG/WebP up to
20 MB and 40 megapixels, store a metadata-free static image up to 3840 pixels
@@ -144,15 +168,19 @@ viewing angle and field of view must stay constant throughout the entire loop,
including Dream Wander and Future Atelier (user correction, 2026-10-02). No pans,
tilts, dolly movement, zooms or perspective drift; matching first and last frames
alone is insufficient. Built-in static artwork
-uses 3584×2240 WebP. All three official 2304×1440 videos are bundled, fully offline,
-with no duplicate low-resolution assets or resolution switching on window resize.
+uses 3584×2240 WebP. The three official scenes use bundled 640×400 previews and
+download the full WebP or 2304×1440 MP4 on demand (2026-10-15 decision), with no
+resolution switching on window resize. Only the previews enter the Renderer bundle.
The motion approved on 2026-10-02 is preserved frame for frame at its original
-24fps. The bundled 2304×1440 delivery is Real-ESRGAN anime-video super-resolution
+24fps. The 2304×1440 delivery is Real-ESRGAN anime-video super-resolution
of the approved 1214×758 sources, not native 2K generation; do not regenerate,
retime or reverse the accepted motion while preparing higher-resolution assets.
-The CDN mechanism remains opt-in for future catalog entries marked as CDN-delivered;
-those entries can use a bundled fallback while downloading verified HD bytes into
-the managed media store. Official scenes never request CDN resources.
+Download only selected, visible assets and request video only for active dynamic
+mode without reduced motion. Verify byte length and SHA-256 before placing assets
+in the existing client-wallpaper media scope. Valid cached content is reused across
+restarts, upgrades and accounts without another download; failures retain the preview
+and permit retry. The download and cache contract is defined in
+[`media-storage-and-protocols.md`](../dev-rules/media-storage-and-protocols.md).
Decode one local video
per window, suspend playback while hidden/minimized, and use the original still for
reduced motion or playback failure. Static / Dynamic switches crossfade the video