Merge branch 'main' into dev

intel · Sep 26, 2024 · e3a28f3 · e3a28f3
2 parents 07058d4 + 4924092
commit e3a28f3
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 1 deletion.
diff --git a/WebUI/electron/electron-env.d.ts b/WebUI/electron/electron-env.d.ts
@@ -43,7 +43,7 @@ type LocalSettings = {
 type ThemeSettings = {
   availableThemes: Theme[];
   currentTheme: Theme;
-};
+
 
 type ModelPaths = {
   llm: string,

diff --git a/WebUI/electron/main.ts b/WebUI/electron/main.ts
@@ -260,6 +260,7 @@ function initEventHandle() {
     return {
       availableThemes: settings.availableThemes,
       currentTheme:settings.currentTheme
+
     };
   });
 

diff --git a/WebUI/external/settings-dev.json b/WebUI/external/settings-dev.json
@@ -4,4 +4,5 @@
     "port":56789,
     "availableThemes": ["dark","lnl"],
     "currentTheme": "lnl"
+
 }
diff --git a/WebUI/src/views/AppSettings.vue b/WebUI/src/views/AppSettings.vue
@@ -57,6 +57,13 @@
                         </template>
                     </drop-selector>
                 </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>
+                </div>
                 <div class="flex flex-col gap-2">
                     <p>{{ languages.SETTINGS_INFERENCE_DEVICE }}</p>
                     <div class="flex items-center gap-2 flex-wrap">