diff --git a/Cargo.lock b/Cargo.lock index 2847eb3..566b8bf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3594,7 +3594,7 @@ dependencies = [ [[package]] name = "squid-cli" -version = "0.1.9" +version = "0.1.10" dependencies = [ "anyhow", "chrono", @@ -3614,7 +3614,7 @@ dependencies = [ [[package]] name = "squid-core" -version = "0.1.9" +version = "0.1.10" dependencies = [ "anyhow", "chrono", @@ -3633,7 +3633,7 @@ dependencies = [ [[package]] name = "squid-engine" -version = "0.1.9" +version = "0.1.10" dependencies = [ "anyhow", "chrono", @@ -3653,7 +3653,7 @@ dependencies = [ [[package]] name = "squid-guard" -version = "0.1.9" +version = "0.1.10" dependencies = [ "chrono", "hex", @@ -3669,7 +3669,7 @@ dependencies = [ [[package]] name = "squid-platform" -version = "0.1.9" +version = "0.1.10" dependencies = [ "dirs", "file_icon_provider", @@ -3689,7 +3689,7 @@ dependencies = [ [[package]] name = "squid-rules" -version = "0.1.9" +version = "0.1.10" dependencies = [ "globset", "serde", @@ -3701,7 +3701,7 @@ dependencies = [ [[package]] name = "squid-stats" -version = "0.1.9" +version = "0.1.10" dependencies = [ "chrono", "libc", @@ -3714,7 +3714,7 @@ dependencies = [ [[package]] name = "squid-tui" -version = "0.1.9" +version = "0.1.10" dependencies = [ "anyhow", "chrono", diff --git a/Cargo.toml b/Cargo.toml index e658ff7..67148c5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,7 @@ members = ["crates/*"] exclude = ["src-tauri"] [workspace.package] -version = "0.1.9" +version = "0.1.10" edition = "2021" rust-version = "1.95" license = "GPL-3.0-only" diff --git a/package.json b/package.json index 43ed9a1..baa0a3c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "squid-desktop", "private": true, - "version": "0.1.9", + "version": "0.1.10", "type": "module", "scripts": { "dev": "vite --port 1420 --strictPort", diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index b4636b8..e32dc47 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -4760,7 +4760,7 @@ dependencies = [ [[package]] name = "squid-core" -version = "0.1.9" +version = "0.1.10" dependencies = [ "anyhow", "chrono", @@ -4779,7 +4779,7 @@ dependencies = [ [[package]] name = "squid-desktop" -version = "0.1.9" +version = "0.1.10" dependencies = [ "base64 0.22.1", "chrono", @@ -4806,7 +4806,7 @@ dependencies = [ [[package]] name = "squid-engine" -version = "0.1.9" +version = "0.1.10" dependencies = [ "anyhow", "chrono", @@ -4826,7 +4826,7 @@ dependencies = [ [[package]] name = "squid-guard" -version = "0.1.9" +version = "0.1.10" dependencies = [ "chrono", "hex", @@ -4842,7 +4842,7 @@ dependencies = [ [[package]] name = "squid-platform" -version = "0.1.9" +version = "0.1.10" dependencies = [ "dirs 6.0.0", "file_icon_provider", @@ -4862,7 +4862,7 @@ dependencies = [ [[package]] name = "squid-rules" -version = "0.1.9" +version = "0.1.10" dependencies = [ "globset", "serde", @@ -4874,7 +4874,7 @@ dependencies = [ [[package]] name = "squid-stats" -version = "0.1.9" +version = "0.1.10" dependencies = [ "chrono", "libc", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index d77c6c1..010193e 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "squid-desktop" -version = "0.1.9" +version = "0.1.10" description = "Squid — a CleanMyMac-inspired cleaner, uninstaller and system monitor." authors = ["squid contributors"] edition = "2021" diff --git a/src-tauri/icon.svg b/src-tauri/icon.svg index c28f051..0b64cca 100644 --- a/src-tauri/icon.svg +++ b/src-tauri/icon.svg @@ -1,35 +1,13 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + diff --git a/src-tauri/icons/128x128.png b/src-tauri/icons/128x128.png index 2cd63d8..cea85e3 100644 Binary files a/src-tauri/icons/128x128.png and b/src-tauri/icons/128x128.png differ diff --git a/src-tauri/icons/128x128@2x.png b/src-tauri/icons/128x128@2x.png index dc34759..07d117a 100644 Binary files a/src-tauri/icons/128x128@2x.png and b/src-tauri/icons/128x128@2x.png differ diff --git a/src-tauri/icons/32x32.png b/src-tauri/icons/32x32.png index 50d017d..c8aa62d 100644 Binary files a/src-tauri/icons/32x32.png and b/src-tauri/icons/32x32.png differ diff --git a/src-tauri/icons/64x64.png b/src-tauri/icons/64x64.png index d51268a..a232f32 100644 Binary files a/src-tauri/icons/64x64.png and b/src-tauri/icons/64x64.png differ diff --git a/src-tauri/icons/Square107x107Logo.png b/src-tauri/icons/Square107x107Logo.png index 6f04e5a..43ee707 100644 Binary files a/src-tauri/icons/Square107x107Logo.png and b/src-tauri/icons/Square107x107Logo.png differ diff --git a/src-tauri/icons/Square142x142Logo.png b/src-tauri/icons/Square142x142Logo.png index 6182438..3297535 100644 Binary files a/src-tauri/icons/Square142x142Logo.png and b/src-tauri/icons/Square142x142Logo.png differ diff --git a/src-tauri/icons/Square150x150Logo.png b/src-tauri/icons/Square150x150Logo.png index dc15a26..dee67d7 100644 Binary files a/src-tauri/icons/Square150x150Logo.png and b/src-tauri/icons/Square150x150Logo.png differ diff --git a/src-tauri/icons/Square284x284Logo.png b/src-tauri/icons/Square284x284Logo.png index 123238a..1e62a6e 100644 Binary files a/src-tauri/icons/Square284x284Logo.png and b/src-tauri/icons/Square284x284Logo.png differ diff --git a/src-tauri/icons/Square30x30Logo.png b/src-tauri/icons/Square30x30Logo.png index ccad109..a295c9b 100644 Binary files a/src-tauri/icons/Square30x30Logo.png and b/src-tauri/icons/Square30x30Logo.png differ diff --git a/src-tauri/icons/Square310x310Logo.png b/src-tauri/icons/Square310x310Logo.png index e753c33..328673d 100644 Binary files a/src-tauri/icons/Square310x310Logo.png and b/src-tauri/icons/Square310x310Logo.png differ diff --git a/src-tauri/icons/Square44x44Logo.png b/src-tauri/icons/Square44x44Logo.png index 7753114..396c465 100644 Binary files a/src-tauri/icons/Square44x44Logo.png and b/src-tauri/icons/Square44x44Logo.png differ diff --git a/src-tauri/icons/Square71x71Logo.png b/src-tauri/icons/Square71x71Logo.png index 2e73017..11e5d50 100644 Binary files a/src-tauri/icons/Square71x71Logo.png and b/src-tauri/icons/Square71x71Logo.png differ diff --git a/src-tauri/icons/Square89x89Logo.png b/src-tauri/icons/Square89x89Logo.png index 15b5d95..0a3d9db 100644 Binary files a/src-tauri/icons/Square89x89Logo.png and b/src-tauri/icons/Square89x89Logo.png differ diff --git a/src-tauri/icons/StoreLogo.png b/src-tauri/icons/StoreLogo.png index 177476e..a224c66 100644 Binary files a/src-tauri/icons/StoreLogo.png and b/src-tauri/icons/StoreLogo.png differ diff --git a/src-tauri/icons/android/mipmap-hdpi/ic_launcher.png b/src-tauri/icons/android/mipmap-hdpi/ic_launcher.png index 0a877c1..a8b7462 100644 Binary files a/src-tauri/icons/android/mipmap-hdpi/ic_launcher.png and b/src-tauri/icons/android/mipmap-hdpi/ic_launcher.png differ diff --git a/src-tauri/icons/android/mipmap-hdpi/ic_launcher_foreground.png b/src-tauri/icons/android/mipmap-hdpi/ic_launcher_foreground.png index 39bf0b2..0112461 100644 Binary files a/src-tauri/icons/android/mipmap-hdpi/ic_launcher_foreground.png and b/src-tauri/icons/android/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/src-tauri/icons/android/mipmap-hdpi/ic_launcher_round.png b/src-tauri/icons/android/mipmap-hdpi/ic_launcher_round.png index e3ae30e..8bd07dc 100644 Binary files a/src-tauri/icons/android/mipmap-hdpi/ic_launcher_round.png and b/src-tauri/icons/android/mipmap-hdpi/ic_launcher_round.png differ diff --git a/src-tauri/icons/android/mipmap-mdpi/ic_launcher.png b/src-tauri/icons/android/mipmap-mdpi/ic_launcher.png index de4c00e..e466758 100644 Binary files a/src-tauri/icons/android/mipmap-mdpi/ic_launcher.png and b/src-tauri/icons/android/mipmap-mdpi/ic_launcher.png differ diff --git a/src-tauri/icons/android/mipmap-mdpi/ic_launcher_foreground.png b/src-tauri/icons/android/mipmap-mdpi/ic_launcher_foreground.png index 1c5352f..407dec8 100644 Binary files a/src-tauri/icons/android/mipmap-mdpi/ic_launcher_foreground.png and b/src-tauri/icons/android/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/src-tauri/icons/android/mipmap-mdpi/ic_launcher_round.png b/src-tauri/icons/android/mipmap-mdpi/ic_launcher_round.png index 84e67ff..56f2081 100644 Binary files a/src-tauri/icons/android/mipmap-mdpi/ic_launcher_round.png and b/src-tauri/icons/android/mipmap-mdpi/ic_launcher_round.png differ diff --git a/src-tauri/icons/android/mipmap-xhdpi/ic_launcher.png b/src-tauri/icons/android/mipmap-xhdpi/ic_launcher.png index 1e980b7..d2cfd35 100644 Binary files a/src-tauri/icons/android/mipmap-xhdpi/ic_launcher.png and b/src-tauri/icons/android/mipmap-xhdpi/ic_launcher.png differ diff --git a/src-tauri/icons/android/mipmap-xhdpi/ic_launcher_foreground.png b/src-tauri/icons/android/mipmap-xhdpi/ic_launcher_foreground.png index a0a602b..6bb6391 100644 Binary files a/src-tauri/icons/android/mipmap-xhdpi/ic_launcher_foreground.png and b/src-tauri/icons/android/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/src-tauri/icons/android/mipmap-xhdpi/ic_launcher_round.png b/src-tauri/icons/android/mipmap-xhdpi/ic_launcher_round.png index 24eafa6..027f77e 100644 Binary files a/src-tauri/icons/android/mipmap-xhdpi/ic_launcher_round.png and b/src-tauri/icons/android/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher.png b/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher.png index 8463ae6..49880bc 100644 Binary files a/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher.png and b/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher.png differ diff --git a/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_foreground.png b/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_foreground.png index ef978ff..9b58468 100644 Binary files a/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_foreground.png and b/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_round.png b/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_round.png index 8c9edf8..e518da2 100644 Binary files a/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_round.png and b/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher.png b/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher.png index cbb11f3..e2d25be 100644 Binary files a/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher.png and b/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_foreground.png b/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_foreground.png index ff4dab8..bdaaf8d 100644 Binary files a/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_foreground.png and b/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_round.png b/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_round.png index e0506cd..40a3228 100644 Binary files a/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_round.png and b/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/src-tauri/icons/brand-mark.svg b/src-tauri/icons/brand-mark.svg new file mode 100644 index 0000000..1301cce --- /dev/null +++ b/src-tauri/icons/brand-mark.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/src-tauri/icons/icon.icns b/src-tauri/icons/icon.icns index 60adc18..42cfc5f 100644 Binary files a/src-tauri/icons/icon.icns and b/src-tauri/icons/icon.icns differ diff --git a/src-tauri/icons/icon.ico b/src-tauri/icons/icon.ico index 57dbcce..dd971d7 100644 Binary files a/src-tauri/icons/icon.ico and b/src-tauri/icons/icon.ico differ diff --git a/src-tauri/icons/icon.png b/src-tauri/icons/icon.png index 71af131..45255b9 100644 Binary files a/src-tauri/icons/icon.png and b/src-tauri/icons/icon.png differ diff --git a/src-tauri/icons/ios/AppIcon-20x20@1x.png b/src-tauri/icons/ios/AppIcon-20x20@1x.png index 5e2e2be..d552f6f 100644 Binary files a/src-tauri/icons/ios/AppIcon-20x20@1x.png and b/src-tauri/icons/ios/AppIcon-20x20@1x.png differ diff --git a/src-tauri/icons/ios/AppIcon-20x20@2x-1.png b/src-tauri/icons/ios/AppIcon-20x20@2x-1.png index 96f11ac..aeca17a 100644 Binary files a/src-tauri/icons/ios/AppIcon-20x20@2x-1.png and b/src-tauri/icons/ios/AppIcon-20x20@2x-1.png differ diff --git a/src-tauri/icons/ios/AppIcon-20x20@2x.png b/src-tauri/icons/ios/AppIcon-20x20@2x.png index 96f11ac..aeca17a 100644 Binary files a/src-tauri/icons/ios/AppIcon-20x20@2x.png and b/src-tauri/icons/ios/AppIcon-20x20@2x.png differ diff --git a/src-tauri/icons/ios/AppIcon-20x20@3x.png b/src-tauri/icons/ios/AppIcon-20x20@3x.png index a39d755..66cfef4 100644 Binary files a/src-tauri/icons/ios/AppIcon-20x20@3x.png and b/src-tauri/icons/ios/AppIcon-20x20@3x.png differ diff --git a/src-tauri/icons/ios/AppIcon-29x29@1x.png b/src-tauri/icons/ios/AppIcon-29x29@1x.png index 38bb411..80022b7 100644 Binary files a/src-tauri/icons/ios/AppIcon-29x29@1x.png and b/src-tauri/icons/ios/AppIcon-29x29@1x.png differ diff --git a/src-tauri/icons/ios/AppIcon-29x29@2x-1.png b/src-tauri/icons/ios/AppIcon-29x29@2x-1.png index 92942d5..5faa9db 100644 Binary files a/src-tauri/icons/ios/AppIcon-29x29@2x-1.png and b/src-tauri/icons/ios/AppIcon-29x29@2x-1.png differ diff --git a/src-tauri/icons/ios/AppIcon-29x29@2x.png b/src-tauri/icons/ios/AppIcon-29x29@2x.png index 92942d5..5faa9db 100644 Binary files a/src-tauri/icons/ios/AppIcon-29x29@2x.png and b/src-tauri/icons/ios/AppIcon-29x29@2x.png differ diff --git a/src-tauri/icons/ios/AppIcon-29x29@3x.png b/src-tauri/icons/ios/AppIcon-29x29@3x.png index 86e699f..388449c 100644 Binary files a/src-tauri/icons/ios/AppIcon-29x29@3x.png and b/src-tauri/icons/ios/AppIcon-29x29@3x.png differ diff --git a/src-tauri/icons/ios/AppIcon-40x40@1x.png b/src-tauri/icons/ios/AppIcon-40x40@1x.png index 96f11ac..aeca17a 100644 Binary files a/src-tauri/icons/ios/AppIcon-40x40@1x.png and b/src-tauri/icons/ios/AppIcon-40x40@1x.png differ diff --git a/src-tauri/icons/ios/AppIcon-40x40@2x-1.png b/src-tauri/icons/ios/AppIcon-40x40@2x-1.png index 48ff97e..8e6ad96 100644 Binary files a/src-tauri/icons/ios/AppIcon-40x40@2x-1.png and b/src-tauri/icons/ios/AppIcon-40x40@2x-1.png differ diff --git a/src-tauri/icons/ios/AppIcon-40x40@2x.png b/src-tauri/icons/ios/AppIcon-40x40@2x.png index 48ff97e..8e6ad96 100644 Binary files a/src-tauri/icons/ios/AppIcon-40x40@2x.png and b/src-tauri/icons/ios/AppIcon-40x40@2x.png differ diff --git a/src-tauri/icons/ios/AppIcon-40x40@3x.png b/src-tauri/icons/ios/AppIcon-40x40@3x.png index cb22dac..8fb1101 100644 Binary files a/src-tauri/icons/ios/AppIcon-40x40@3x.png and b/src-tauri/icons/ios/AppIcon-40x40@3x.png differ diff --git a/src-tauri/icons/ios/AppIcon-512@2x.png b/src-tauri/icons/ios/AppIcon-512@2x.png index bab48ef..c0e2d22 100644 Binary files a/src-tauri/icons/ios/AppIcon-512@2x.png and b/src-tauri/icons/ios/AppIcon-512@2x.png differ diff --git a/src-tauri/icons/ios/AppIcon-60x60@2x.png b/src-tauri/icons/ios/AppIcon-60x60@2x.png index cb22dac..8fb1101 100644 Binary files a/src-tauri/icons/ios/AppIcon-60x60@2x.png and b/src-tauri/icons/ios/AppIcon-60x60@2x.png differ diff --git a/src-tauri/icons/ios/AppIcon-60x60@3x.png b/src-tauri/icons/ios/AppIcon-60x60@3x.png index 89ffdb5..ceaeac2 100644 Binary files a/src-tauri/icons/ios/AppIcon-60x60@3x.png and b/src-tauri/icons/ios/AppIcon-60x60@3x.png differ diff --git a/src-tauri/icons/ios/AppIcon-76x76@1x.png b/src-tauri/icons/ios/AppIcon-76x76@1x.png index 6b552cc..3d8c1c3 100644 Binary files a/src-tauri/icons/ios/AppIcon-76x76@1x.png and b/src-tauri/icons/ios/AppIcon-76x76@1x.png differ diff --git a/src-tauri/icons/ios/AppIcon-76x76@2x.png b/src-tauri/icons/ios/AppIcon-76x76@2x.png index 678f413..a56da13 100644 Binary files a/src-tauri/icons/ios/AppIcon-76x76@2x.png and b/src-tauri/icons/ios/AppIcon-76x76@2x.png differ diff --git a/src-tauri/icons/ios/AppIcon-83.5x83.5@2x.png b/src-tauri/icons/ios/AppIcon-83.5x83.5@2x.png index 0221cc7..a1ea9fa 100644 Binary files a/src-tauri/icons/ios/AppIcon-83.5x83.5@2x.png and b/src-tauri/icons/ios/AppIcon-83.5x83.5@2x.png differ diff --git a/src-tauri/icons/tray-template.png b/src-tauri/icons/tray-template.png index ae43c26..27dcfd1 100644 Binary files a/src-tauri/icons/tray-template.png and b/src-tauri/icons/tray-template.png differ diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 57c2226..66ab362 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "$schema": "https://schema.tauri.app/config/2", "productName": "Squid", - "version": "0.1.9", + "version": "0.1.10", "identifier": "app.nex.squid", "mainBinaryName": "squid-desktop", "build": { diff --git a/src/App.tsx b/src/App.tsx index 776198c..8e23fbf 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -34,7 +34,7 @@ import type { } from "./types"; import { useToast } from "./components/ui"; import { SetupPanel } from "./components/SetupPanel"; -import appIconUrl from "../src-tauri/icons/128x128.png"; +import brandMarkUrl from "../src-tauri/icons/brand-mark.svg"; import { ApplicationsPage } from "./pages/ApplicationsPage"; import { CleanupPage } from "./pages/CleanupPage"; import { HistoryPage } from "./pages/HistoryPage"; @@ -145,7 +145,7 @@ function BrandMark({ small = false }: { small?: boolean }) { return ( diff --git a/src/pages/ApplicationsPage.tsx b/src/pages/ApplicationsPage.tsx index b96e1bc..8e68ab0 100644 --- a/src/pages/ApplicationsPage.tsx +++ b/src/pages/ApplicationsPage.tsx @@ -151,7 +151,7 @@ export function ApplicationsPage({ return (
{cleanup.result ? t( - `${formatBytes(found)} found safely.`, - `安全发现 ${formatBytes(found)} 可清理空间。`, + `${formatBytes(found)} found safely`, + `安全发现 ${formatBytes(found)} 可清理空间`, ) - : t("A lighter, faster machine.", "更轻盈,更顺畅。")} + : t("A lighter, faster machine", "更轻盈,更顺畅")}

{cleanup.result diff --git a/src/pages/PermissionsPage.tsx b/src/pages/PermissionsPage.tsx index 8d75dd9..2bd1d42 100644 --- a/src/pages/PermissionsPage.tsx +++ b/src/pages/PermissionsPage.tsx @@ -87,7 +87,7 @@ export function PermissionsPage({ workspace }: { workspace: PermissionsWorkspace

("general"); const [whitelistInput, setWhitelistInput] = useState(""); const [saving, setSaving] = useState(false); const [error, setError] = useState(null); @@ -176,366 +195,422 @@ export function SettingsPage({ return (
{error ? setError(null)} /> : null} -
-
-
-

- - {t("Language & appearance", "语言与外观")} -

-
-
-
- - -
-
+
+ {SETTINGS_TABS.map((item) => { + const Icon = item.icon; + return ( + + ); + })} +
- {bootstrap.platform === "macos" ? ( -
+ {tab === "general" ? ( +
+
+
+
+

+ + {t("Language & appearance", "语言与外观")} +

+
+
+
+ + +
+
+ +
+
+
+

+ + {t("Startup", "启动")} +

+
+
+
+
+ {t("Launch Squid at login", "登录时启动 Squid")} + + {t( + "Only Squid itself; other apps are managed under Startup items.", + "仅 Squid 自身,其他程序请到启动项页面管理。", + )} + +
+ void setLaunchAtLogin(enabled)} + disabled={autostart === null || savingAutostart} + label={t("Launch Squid at login", "登录时启动 Squid")} + /> +
+
+
+ ) : null} + + {tab === "cleanup" ? ( +
+
+
+
+

+ + {t("Deletion safety", "删除安全")} +

+
+
+
+ + +
+
+
+ {t("Report allocated size", "显示磁盘实际占用")} + + {t( + "Prefer on-disk bytes for sparse and compressed files.", + "对稀疏和压缩文件优先显示磁盘实际占用。", + )} + +
+ +
+
+
+ {t("History records to keep", "保留历史记录数量")} +
+ setWhitelistInput(event.target.value)} + placeholder={t("Folder path to protect", "要保护的文件夹路径")} + onKeyDown={(event) => { + if (event.key === "Enter") void addWhitelist(); + }} + /> + + +
+
+ {settings.whitelist.length === 0 ? ( +

+ {t("No protected folders yet.", "尚未设置受保护的文件夹。")} +

+ ) : ( + settings.whitelist.map((pattern) => ( +
+ + + + {shortPath(pattern, 88)} + +
+ )) + )} +
+
+
+ ) : null} + + {tab === "security" ? ( + <> + {bootstrap.platform === "macos" ? ( +
+
+
+

+ + {t("System permissions", "系统权限")} +

+
+
+
+ + + +
+ + {t("Full Disk Access", "完全磁盘访问权限")} + + {checkingPermission + ? t("Checking…", "检查中…") + : permission?.fullDiskAccess === "granted" + ? t("Granted", "已授权") + : permission?.fullDiskAccess === "denied" + ? t("Needs attention", "需要授权") + : t("Not confirmed", "未确认")} + + + + {t( + "Enables scans of TCC-protected caches, mail data and app leftovers.", + "用于扫描受 TCC 保护的缓存、邮件数据与应用卸载残留。", + )} + +
+
+ + +
+
+
+ ) : null} + + {security.status ? ( + + ) : ( +
+

+ {t("Security settings are loading…", "安全设置加载中…")} +

+
+ )} + + ) : null} + + {tab === "updates" ? ( + + ) : null} + + {tab === "about" ? ( +

- - {t("System permissions", "系统权限")} + + {t("About Squid", "关于 Squid")}

+

+ {t( + "Configuration and history stay local to this computer.", + "配置与历史记录仅保存在这台电脑上。", + )} +

-
- - - -
- - {t("Full Disk Access", "完全磁盘访问权限")} - - {checkingPermission - ? t("Checking…", "检查中…") - : permission?.fullDiskAccess === "granted" - ? t("Granted", "已授权") - : permission?.fullDiskAccess === "denied" - ? t("Needs attention", "需要授权") - : t("Not confirmed", "未确认")} - - - - {t( - "Enables scans of TCC-protected caches, mail data and app leftovers.", - "用于扫描受 TCC 保护的缓存、邮件数据与应用卸载残留。", - )} - +
+ +
+ Squid + {t(`Version ${bootstrap.version}`, `版本 ${bootstrap.version}`)}
-
+ + {bootstrap.osVersion || bootstrap.osName} · {bootstrap.arch} + +
+
+
+ + + +
+ {t("Configuration", "配置文件")} + {bootstrap.configPath} +
+
+
+ + + +
+ {t("History", "历史记录")} + {bootstrap.historyPath} +
) : null} - -
-
-
-

- - {t("Startup", "启动")} -

-
-
-
-
- {t("Launch Squid at login", "登录时启动 Squid")} - - {t( - "Only Squid itself; other apps are managed under Startup items.", - "仅 Squid 自身,其他程序请到启动项页面管理。", - )} - -
- void setLaunchAtLogin(enabled)} - disabled={autostart === null || savingAutostart} - label={t("Launch Squid at login", "登录时启动 Squid")} - /> -
-
- - {security.status ? ( - - ) : null} - -
-
-
-

- - {t("Deletion safety", "删除安全")} -

-
-
-
- - -
-
-
- {t("Report allocated size", "显示磁盘实际占用")} - - {t( - "Prefer on-disk bytes for sparse and compressed files.", - "对稀疏和压缩文件优先显示磁盘实际占用。", - )} - -
- -
-
-
- {t("History records to keep", "保留历史记录数量")} -
- setWhitelistInput(event.target.value)} - placeholder={t("Folder path to protect", "要保护的文件夹路径")} - onKeyDown={(event) => { - if (event.key === "Enter") void addWhitelist(); - }} - /> - - -
-
- {settings.whitelist.length === 0 ? ( -

- {t("No protected folders yet.", "尚未设置受保护的文件夹。")} -

- ) : ( - settings.whitelist.map((pattern) => ( -
- - - - {shortPath(pattern, 88)} - -
- )) - )} -
-
- - - -
-
-
-

- - {t("Files & information", "文件与信息")} -

-

- {t( - "Configuration and history stay local to this computer.", - "配置与历史记录仅保存在这台电脑上。", - )} -

-
-
-
-
- - - -
- {t("Configuration", "配置文件")} - {bootstrap.configPath} -
- -
-
- - - -
- {t("History", "历史记录")} - {bootstrap.historyPath} -
- -
-
- - - -
- {t("Platform", "平台")} - - {bootstrap.osVersion || bootstrap.osName} · {bootstrap.arch} ·{" "} - {bootstrap.hardware} - -
- v{bootstrap.version} -
-
-
); } diff --git a/src/pages/StartupPage.tsx b/src/pages/StartupPage.tsx index 2a602a4..1717367 100644 --- a/src/pages/StartupPage.tsx +++ b/src/pages/StartupPage.tsx @@ -228,7 +228,7 @@ export function StartupPage({ return (
.settings-section { + margin-bottom: 0; +} + +.settings-grid .delete-mode-cards { + grid-template-columns: 1fr; +} + .settings-section { margin-bottom: 13px; padding: 18px; @@ -4143,6 +4176,58 @@ select:focus-visible, font-weight: var(--nex-weight-semibold); } +.about-brand { + display: flex; + align-items: center; + gap: 12px; + margin-bottom: 13px; + padding-bottom: 13px; + border-bottom: 1px solid var(--nex-line); +} + +.about-mark { + display: block; + flex: 0 0 auto; + width: 52px; + height: 52px; + border-radius: 15px; + box-shadow: 0 8px 20px rgba(122, 48, 24, 0.16); +} + +.about-brand-copy { + display: flex; + min-width: 0; + flex: 1; + flex-direction: column; + gap: 1px; +} + +.about-brand-copy strong { + color: var(--nex-ink-strong); + font-size: var(--nex-text-lg); + font-weight: var(--nex-weight-display); + letter-spacing: -0.03em; +} + +.about-brand-copy span { + color: var(--nex-muted); + font-size: var(--nex-text-3xs); +} + +.about-platform { + flex: 0 0 auto; + max-width: 45%; + overflow: hidden; + padding: 4px 8px; + border-radius: 7px; + color: var(--nex-muted); + background: var(--nex-cream); + font-size: var(--nex-text-3xs); + font-weight: var(--nex-weight-semibold); + text-overflow: ellipsis; + white-space: nowrap; +} + /* Update panel */