🐛 Fixed theme and packaging issues

This commit is contained in:
2025-06-21 15:33:50 +08:00
parent 1153c0a652
commit a92e5486b2
8 changed files with 23 additions and 11 deletions

View File

@@ -6,7 +6,7 @@
<key>CFBundleName</key> <key>CFBundleName</key>
<string>Voidraft</string> <string>Voidraft</string>
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string></string> <string>Voidraft</string>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
<string>landaiqing</string> <string>landaiqing</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>

View File

@@ -6,7 +6,7 @@
<key>CFBundleName</key> <key>CFBundleName</key>
<string>Voidraft</string> <string>Voidraft</string>
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string></string> <string>Voidraft</string>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
<string>landaiqing</string> <string>landaiqing</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>

View File

@@ -3,7 +3,7 @@
# #
# The lines below are called `modelines`. See `:help modeline` # The lines below are called `modelines`. See `:help modeline`
name: "" name: "Voidraft"
arch: ${GOARCH} arch: ${GOARCH}
platform: "linux" platform: "linux"
version: "0.0.1.0" version: "0.0.1.0"
@@ -17,12 +17,12 @@ license: "MIT"
release: "1" release: "1"
contents: contents:
- src: "./bin/" - src: "./bin/Voidraft"
dst: "/usr/local/bin/" dst: "/usr/local/bin/Voidraft"
- src: "./build/appicon.png" - src: "./build/appicon.png"
dst: "/usr/share/icons/hicolor/128x128/apps/.png" dst: "/usr/share/icons/hicolor/128x128/apps/Voidraft.png"
- src: "./build/linux/.desktop" - src: "./build/linux/Voidraft.desktop"
dst: "/usr/share/applications/.desktop" dst: "/usr/share/applications/Voidraft.desktop"
depends: depends:
- gtk3 - gtk3

View File

@@ -5,7 +5,7 @@
!include "FileFunc.nsh" !include "FileFunc.nsh"
!ifndef INFO_PROJECTNAME !ifndef INFO_PROJECTNAME
!define INFO_PROJECTNAME "" !define INFO_PROJECTNAME "Voidraft"
!endif !endif
!ifndef INFO_COMPANYNAME !ifndef INFO_COMPANYNAME
!define INFO_COMPANYNAME "Voidraft" !define INFO_COMPANYNAME "Voidraft"

View File

@@ -3,11 +3,13 @@ import { onMounted } from 'vue';
import { useConfigStore } from '@/stores/configStore'; import { useConfigStore } from '@/stores/configStore';
import { useSystemStore } from '@/stores/systemStore'; import { useSystemStore } from '@/stores/systemStore';
import { useKeybindingStore } from '@/stores/keybindingStore'; import { useKeybindingStore } from '@/stores/keybindingStore';
import { useThemeStore } from '@/stores/themeStore';
import WindowTitleBar from '@/components/titlebar/WindowTitleBar.vue'; import WindowTitleBar from '@/components/titlebar/WindowTitleBar.vue';
const configStore = useConfigStore(); const configStore = useConfigStore();
const systemStore = useSystemStore(); const systemStore = useSystemStore();
const keybindingStore = useKeybindingStore(); const keybindingStore = useKeybindingStore();
const themeStore = useThemeStore();
// 应用启动时加载配置和初始化系统信息 // 应用启动时加载配置和初始化系统信息
onMounted(async () => { onMounted(async () => {
@@ -18,7 +20,9 @@ onMounted(async () => {
keybindingStore.loadKeyBindings(), keybindingStore.loadKeyBindings(),
]); ]);
// 初始化语言和主题
await configStore.initializeLanguage(); await configStore.initializeLanguage();
themeStore.initializeTheme();
}); });
</script> </script>

View File

@@ -141,7 +141,7 @@ const DEFAULT_CONFIG: AppConfig = {
}, },
appearance: { appearance: {
language: LanguageType.LangZhCN, language: LanguageType.LangZhCN,
systemTheme: SystemThemeType.SystemThemeDark systemTheme: SystemThemeType.SystemThemeAuto
}, },
updates: {}, updates: {},
metadata: { metadata: {

View File

@@ -130,7 +130,7 @@ export const useEditorStore = defineStore('editor', () => {
// 获取主题扩展 // 获取主题扩展
const themeExtension = createThemeExtension( const themeExtension = createThemeExtension(
configStore.config.appearance.systemTheme || SystemThemeType.SystemThemeDark configStore.config.appearance.systemTheme || SystemThemeType.SystemThemeAuto
); );
// 获取Tab相关扩展 // 获取Tab相关扩展

View File

@@ -23,6 +23,12 @@ export const useThemeStore = defineStore('theme', () => {
); );
}; };
// 初始化主题
const initializeTheme = () => {
const theme = configStore.config?.appearance?.systemTheme || SystemThemeType.SystemThemeAuto;
applyThemeToDOM(theme);
};
// 设置主题 // 设置主题
const setTheme = async (theme: SystemThemeType) => { const setTheme = async (theme: SystemThemeType) => {
await configStore.setSystemTheme(theme); await configStore.setSystemTheme(theme);
@@ -32,5 +38,7 @@ export const useThemeStore = defineStore('theme', () => {
return { return {
currentTheme, currentTheme,
setTheme, setTheme,
initializeTheme,
applyThemeToDOM,
}; };
}); });