fix: remove community/vendor type in themes

Signed-off-by: Stefan Dej <[email protected]>
mainsail-crew · Apr 28, 2024 · 472957d · 472957d
1 parent 5125332
commit 472957d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 15 deletions.
diff --git a/src/components/settings/SettingsUiSettingsTab.vue b/src/components/settings/SettingsUiSettingsTab.vue
@@ -323,16 +323,8 @@ export default class SettingsUiSettingsTab extends Mixins(BaseMixin, ThemeMixin)
 
     get themes() {
         return themes.map((theme) => {
-            let text = theme.displayName
-
-            if (theme.type === 'community' && theme.name !== 'mainsail')
-                text = this.$t('Settings.UiSettingsTab.CommunityTheme', { name: theme.displayName }).toString()
-
-            if (theme.type === 'vendor')
-                text = this.$t('Settings.UiSettingsTab.VendorTheme', { name: theme.displayName }).toString()
-
             return {
-                text,
+                text: theme.displayName,
                 value: theme.name,
             }
         })

diff --git a/src/locales/en.json b/src/locales/en.json
@@ -1152,7 +1152,6 @@
             "BoolBigThumbnailDescription": "Display a large thumbnail in the status panel during a print.",
             "BoolHideUploadAndPrintButton": "Hide Upload and Print Button",
             "BoolHideUploadAndPrintButtonDescription": "Show or hide the \"Upload and Print\" button in the top bar.",
-            "CommunityTheme": "Community - {name}",
             "ConfirmOnCoolDown": "Require confirm on CoolDown",
             "ConfirmOnCoolDownDescription": "Show a confirmation dialog on CoolDown",
             "ConfirmOnEmergencyStop": "Require confirm on Emergency Stop",
@@ -1201,8 +1200,7 @@
             "ThemeDark": "Dark",
             "ThemeDescription": "Change the overall look and feel of the application.",
             "ThemeLight": "Light",
-            "UiSettings": "UI-Settings",
-            "VendorTheme": "Vendor - {name}"
+            "UiSettings": "UI-Settings"
         },
         "Update": "update",
         "WebcamsTab": {

diff --git a/src/store/types.ts b/src/store/types.ts
@@ -40,7 +40,6 @@ export interface ConfigJsonInstance {
 }
 
 export interface Theme {
-    type: 'community' | 'vendor'
     name: string
     displayName: string
     colorLogo?: string

diff --git a/src/store/variables.ts b/src/store/variables.ts
@@ -147,6 +147,6 @@ export const rolloverLogfiles = ['klipper', 'moonraker']
  * List of all Themes
  */
 export const themes: Theme[] = [
-    { type: 'community', name: 'mainsail', displayName: 'Mainsail', colorLogo: defaultLogoColor },
-    { type: 'community', name: 'klipper', displayName: 'Klipper', colorLogo: '#b12f35', sidebarLogo: true },
+    { name: 'mainsail', displayName: 'Mainsail', colorLogo: defaultLogoColor },
+    { name: 'klipper', displayName: 'Klipper', colorLogo: '#b12f35', sidebarLogo: true },
 ]