Skip to content

Improvements for Lunar Lake Release #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 25, 2024
Merged

Improvements for Lunar Lake Release #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0592f0b
Replace language picker radio by dropdown
DanielHirschTNG Sep 25, 2024
4bc8f47
Update language names in language dropdown
DanielHirschTNG Sep 25, 2024
e8141f4
Add theme configuration to settings.json
DanielHirschTNG Sep 25, 2024
c5cb8f8
Merge branch 'language-picker' into dev
DanielHirschTNG Sep 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions WebUI/electron/electron-env.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ type LocalSettings = {

type ThemeSettings = {
availableThemes: Theme[];
currentTheme: Theme;
};

type ModelPaths = {
Expand Down
3 changes: 2 additions & 1 deletion WebUI/external/settings-dev.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
"envType": "arc",
"debug":1,
"port":56789,
"availableThemes": ["dark","lnl"]
"availableThemes": ["dark","lnl"],
"currentTheme": "lnl"
}
37 changes: 36 additions & 1 deletion WebUI/src/assets/js/store/i18n.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
import { defineStore } from "pinia";

export const useI18N = defineStore("i18n", () => {

const langName = ref("en_US");
const currentLanguageName = ref("English");
const state = reactive<StringKV>({
});

async function init() {
const language = localStorage.getItem("language");
if (language == "zh_CN" || language == "en_US") {
if (language == "zh_CN" || language == "en_US" || language == "ko_KR") {
await switchLanguage(language);
} else {
await initFromLocal();
Expand All @@ -19,24 +21,57 @@ export const useI18N = defineStore("i18n", () => {
return switchLanguage(navigator.language == "zh-CN" ? "zh_CN" : "en_US");
}

function changeLanguage(value: any, index: number) {
switchLanguage(value.value)
}

function updateLanguageRecord(record: Record<string, string>) {
Object.keys(record).forEach((key) => {
state[key] = record[key];
});
document.title = state.MAIN_TITLE;
}

const languageOptions = ref([
{ value: 'en_US', name: state.SETTINGS_BASIC_LANGUAGE_EN },
{ value: 'zh_CN', name: state.SETTINGS_BASIC_LANGUAGE_ZH },
{ value: 'ko_KR', name: state.SETTINGS_BASIC_LANGUAGE_KO },
])

const currentLanguageDict = ref<StringKV>({
"en_US": state.SETTINGS_BASIC_LANGUAGE_EN,
"zh_CN": state.SETTINGS_BASIC_LANGUAGE_ZH,
"ko_KR": state.SETTINGS_BASIC_LANGUAGE_KO,
});

async function updateLanguageNames(lang: string) {
currentLanguageDict.value["en_US"] = state.SETTINGS_BASIC_LANGUAGE_EN;
currentLanguageDict.value["zh_CN"] = state.SETTINGS_BASIC_LANGUAGE_ZH;
currentLanguageDict.value["ko_KR"] = state.SETTINGS_BASIC_LANGUAGE_KO;
currentLanguageName.value = currentLanguageDict.value[lang];
languageOptions.value = languageOptions.value.map((item) => {
item.name = currentLanguageDict.value[item.value];
return item;
});
}

async function switchLanguage(lang: string) {
const languageRecords = await import(`../../i18n/${lang}.json`);
updateLanguageRecord(languageRecords);
langName.value = lang;
localStorage.setItem("language", lang);
updateLanguageNames(lang);
}

return {
state,
langName,
languageOptions,
currentLanguageName,
init,
switchLanguage,
changeLanguage,
};


});
1 change: 1 addition & 0 deletions WebUI/src/assets/js/store/theme.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ export const useTheme = defineStore("theme", () => {
window.electronAPI.getThemeSettings().then((themeSettings) => {
const themesFromSettings = themeSettings.availableThemes.filter(t => knownThemes.includes(t));
if (themesFromSettings.length > 0) availableThemes.value = themesFromSettings;
if (knownThemes.includes(themeSettings.currentTheme)) selected.value = themeSettings.currentTheme;
});

return {
Expand Down
29 changes: 14 additions & 15 deletions WebUI/src/views/AppSettings.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,21 +42,20 @@
<div class="px-3 flex-none flex flex-col gap-3">
<div class="flex flex-col gap-2">
<p>{{ languages.SETTINGS_BASIC_LANGUAGE }}</p>
<div class="grid grid-cols-2 gap-2">
<radio-bolck :checked="i18n.langName == 'en_US'" :text="languages.SETTINGS_BASIC_LANGUAGE_EN"
@click="() => { i18n.switchLanguage('en_US') }"></radio-bolck>
<radio-bolck :checked="i18n.langName == 'zh_CN'" :text="languages.SETTINGS_BASIC_LANGUAGE_ZH"
@click="() => { i18n.switchLanguage('zh_CN') }"></radio-bolck>
<radio-bolck :checked="i18n.langName == 'ko_KR'" :text="languages.SETTINGS_BASIC_LANGUAGE_KO"
@click="() => { i18n.switchLanguage('ko_KR') }"></radio-bolck>
</div>
</div>
<div v-if="theme.availableThemes.length > 1" class="flex flex-col gap-2">
<p>Theme</p>
<div class="grid grid-cols-2 gap-2">
<radio-bolck class="uppercase" v-for="themeName in theme.availableThemes" :checked="theme.active === themeName" :text="themeName"
@click="() => theme.selected = themeName"></radio-bolck>
</div>
<drop-selector :array="i18n.languageOptions" @change="i18n.changeLanguage">
<template #selected>
<div class="flex gap-2 items-center">
<span class="rounded-full bg-green-500 w-2 h-2"></span>
<span>{{ i18n.currentLanguageName }}</span>
</div>
</template>
<template #list="slotItem">
<div class="flex gap-2 items-center">
<span class="rounded-full bg-green-500 w-2 h-2"></span>
<span>{{ slotItem.item.name }}</span>
</div>
</template>
</drop-selector>
</div>
<div class="flex flex-col gap-2">
<p>{{ languages.SETTINGS_INFERENCE_DEVICE }}</p>
Expand Down