From 82d7baee0b8bed23ff1bbb34950fa84c9a6864a4 Mon Sep 17 00:00:00 2001 From: MystiPanda Date: Thu, 18 Jan 2024 22:19:14 +0800 Subject: [PATCH] feat: Add exit button on setting page --- UPDATELOG.md | 2 ++ src/components/setting/setting-verge.tsx | 37 +++++++++++++++--------- src/locales/en.json | 1 + src/locales/ru.json | 1 + src/locales/zh.json | 1 + 5 files changed, 29 insertions(+), 13 deletions(-) diff --git a/UPDATELOG.md b/UPDATELOG.md index 09374148..692c9b50 100644 --- a/UPDATELOG.md +++ b/UPDATELOG.md @@ -11,6 +11,8 @@ - 连接页面时间排序错误 - 连接页面表格宽度优化 +--- + ## v1.4.8 ### Features diff --git a/src/components/setting/setting-verge.tsx b/src/components/setting/setting-verge.tsx index 5d2d4e9f..b46a91ab 100644 --- a/src/components/setting/setting-verge.tsx +++ b/src/components/setting/setting-verge.tsx @@ -13,6 +13,7 @@ import { import { openAppDir, openCoreDir, openLogsDir } from "@/services/cmds"; import { ArrowForward } from "@mui/icons-material"; import { checkUpdate } from "@tauri-apps/api/updater"; +import { exit } from "@tauri-apps/api/process"; import { useVerge } from "@/hooks/use-verge"; import { version } from "@root/package.json"; import { DialogRef, Notice } from "@/components/base"; @@ -26,7 +27,6 @@ import { GuardState } from "./mods/guard-state"; import { LayoutViewer } from "./mods/layout-viewer"; import { UpdateViewer } from "./mods/update-viewer"; import getSystem from "@/utils/get-system"; -import { portableFlag } from "@/pages/_layout"; import { routers } from "@/pages/_routers"; interface Props { onError?: (err: Error) => void; @@ -293,18 +293,29 @@ const SettingVerge = ({ onError }: Props) => { - {!portableFlag && ( - - - - - - )} + + + + + + + + { + exit(0); + }} + > + + + v{version} diff --git a/src/locales/en.json b/src/locales/en.json index 12cd1192..d9b75550 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -129,6 +129,7 @@ "Back": "Back", "Save": "Save", "Cancel": "Cancel", + "Exit": "Exit", "Default": "Default", "Download Speed": "Download Speed", diff --git a/src/locales/ru.json b/src/locales/ru.json index bdecf73e..39cf0045 100644 --- a/src/locales/ru.json +++ b/src/locales/ru.json @@ -117,6 +117,7 @@ "Back": "Назад", "Save": "Сохранить", "Cancel": "Отмена", + "Exit": "Выход", "open_dashboard": "Open Dashboard", "clash_mode_rule": "Режим правил", diff --git a/src/locales/zh.json b/src/locales/zh.json index c48c32bb..da9fc251 100644 --- a/src/locales/zh.json +++ b/src/locales/zh.json @@ -129,6 +129,7 @@ "Back": "返回", "Save": "保存", "Cancel": "取消", + "Exit": "退出", "Default": "默认", "Download Speed": "下载速度",