github/EasytierGame
4
0
Fork 0
mirror of https://github.com/EasyTier/EasytierGame.git synced 2025-05-19 10:27:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

托盘图标增加主题切换功能，调整成员列表延迟至前方，增加nat类型查看，修复自定义网卡无法保存信息的问题

Browse Source
This commit is contained in:
leizi97
2024-11-04 22:38:53 +08:00
parent cf351b8708
commit 1a5d2cc8fc
9 changed files with 55 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
composables/theme.ts
+3 -3
View File
@@ -1,6 +1,6 @@
import { useDark, useToggle, usePreferredDark } from "@vueuse/core";
import { isFunction } from "lodash-es";
const isDark = usePreferredDark();
// const isDark = usePreferredDark();
const darkConfig = useDark({
selector: "html",
attribute: "class",
@@ -8,9 +8,9 @@ const darkConfig = useDark({
valueLight: "",
});
const toggleDark = useToggle(darkConfig);
export const initTheme = () => {
export const initTheme = (isDark: boolean) => {
if (isDark && isFunction(toggleDark)) {
toggleDark(isDark.value);
toggleDark(isDark);
}
};
composables/tray.ts
+27 -6
View File
@@ -2,6 +2,8 @@ import { Menu, MenuItem, PredefinedMenuItem } from "@tauri-apps/api/menu";
import { TrayIcon } from "@tauri-apps/api/tray";
import { getCurrentWindow } from "@tauri-apps/api/window";
import pkg from "@/package.json";
import { setTheme } from "~/composables/theme";
import useMainStore from "@/stores/index";
const DEFAULT_TRAY_NAME = "main";
@@ -20,8 +22,8 @@ export async function useTray(init: boolean = false, beforExit: Function) {
tray = await TrayIcon.getById(DEFAULT_TRAY_NAME);
if (!tray) {
tray = await TrayIcon.new({
tooltip: `EasyTier\n${pkg.version}`,
title: `EasyTier\n${pkg.version}`,
tooltip: `EasyTierGame\n${pkg.version}`,
title: `EasyTierGame\n${pkg.version}`,
id: DEFAULT_TRAY_NAME,
menu: await Menu.new({
id: "main",
@@ -38,7 +40,7 @@ export async function useTray(init: boolean = false, beforExit: Function) {
}
if (init) {
tray.setTooltip(`EasyTier\n${pkg.version}`);
tray.setTooltip(`EasyTierGame\n${pkg.version}`);
tray.setMenuOnLeftClick(false);
tray.setMenu(
await Menu.new({
@@ -52,7 +54,12 @@ export async function useTray(init: boolean = false, beforExit: Function) {
}
export async function generateMenuItem(beforExit: Function) {
return [await MenuItemShow("显示 / 隐藏"), await PredefinedMenuItem.new({ item: "Separator" }), await MenuItemExit("退出", beforExit)];
return [
await MenuItemShow("显示 / 隐藏"),
await MenuItemTheme(),
await PredefinedMenuItem.new({ item: "Separator" }),
await MenuItemExit("退出", beforExit),
];
}
export async function MenuItemExit(text: string, beforExit: Function) {
@@ -78,6 +85,20 @@ export async function MenuItemShow(text: string) {
});
}
export async function MenuItemTheme() {
return await MenuItem.new({
id: "theme",
text: "主题切换",
action: async () => {
const mainStore = useMainStore();
mainStore.theme = !mainStore.theme;
// const appWindow = getCurrentWindow();
// appWindow.emitTo("main", "config", { theme: mainStore.theme });
await setTheme(mainStore.theme);
},
});
}
// export async function setTrayMenu(items: (MenuItem | PredefinedMenuItem)[] | undefined = undefined) {
// // const tray = await useTray()
// const tray = await TrayIcon.getById(DEFAULT_TRAY_NAME)
@@ -98,8 +119,8 @@ export async function setTrayRunState(tray: TrayIcon | null, isRunning: boolean
export async function setTrayTooltip(tray: TrayIcon | null, tooltip?: string | null) {
if (!tray) return;
if (tooltip) {
await tray.setTooltip(`EasyTier\n${pkg.version}\n${tooltip}`);
await tray.setTooltip(`EasyTierGame\n${pkg.version}\n${tooltip}`);
} else {
await tray.setTooltip(`EasyTier\n${pkg.version}`);
await tray.setTooltip(`EasyTierGame\n${pkg.version}`);
}
}