diff --git a/src/components/TheSettingsMenu.vue b/src/components/TheSettingsMenu.vue
index a103df3ba..84d98f170 100644
--- a/src/components/TheSettingsMenu.vue
+++ b/src/components/TheSettingsMenu.vue
@@ -3,10 +3,10 @@
mdi-cogs
-
+
- mdi-close-thick
+ mdi-close-thick
diff --git a/src/components/TheSidebar.vue b/src/components/TheSidebar.vue
index e4c249c62..02e0b7be3 100644
--- a/src/components/TheSidebar.vue
+++ b/src/components/TheSidebar.vue
@@ -17,13 +17,20 @@
.active-nav-item {
border-right: 4px solid var(--v-primary-base);
}
- .nowrap {
- white-space: nowrap !important;
+ .menu-item-icon {
+ opacity: .85;
+ }
+ .menu-item-title {
+ line-height: 30px;
+ font-size: 14px;
+ font-weight: 600;
+ text-transform: uppercase;
+ opacity: .85;
}
-
+
@@ -31,11 +38,11 @@
router to="/allPrinters"
class="small-list-item mt-1"
>
-
+
- {{ $t("App.Printers")}}
+
@@ -47,11 +54,11 @@
v-if="showInNavi(category)"
class="small-list-item"
>
-
+
- {{ $t(`Router.${category.title}`) }}
+
@@ -59,7 +66,7 @@
-
+
@@ -82,6 +89,7 @@ import AboutModal from '@/components/modals/AboutModal.vue'
AboutModal
}
})
+
export default class TheSidebarAlt extends Mixins(BaseMixin) {
get naviDrawer(): boolean {
return this.$store.state.naviDrawer
@@ -91,8 +99,8 @@ export default class TheSidebarAlt extends Mixins(BaseMixin) {
this.$store.dispatch('setNaviDrawer', newVal)
}
- get boolWideNavDrawer() {
- return this.$store.state.gui.dashboard.boolWideNavDrawer ?? false
+ get menuStyle() {
+ return this.$store.state.gui.dashboard.menuStyle
}
get sidebarBackground(): string {
diff --git a/src/components/settings/SettingsUiSettingsTab.vue b/src/components/settings/SettingsUiSettingsTab.vue
index de9821426..1622038f0 100644
--- a/src/components/settings/SettingsUiSettingsTab.vue
+++ b/src/components/settings/SettingsUiSettingsTab.vue
@@ -60,8 +60,8 @@
-
-
+
+
@@ -80,9 +80,11 @@ import BaseMixin from '@/components/mixins/base'
import SettingsRow from '@/components/settings/SettingsRow.vue'
import {defaultLogoColor, defaultPrimaryColor} from '@/store/variables'
import {Debounce} from 'vue-debounce-decorator'
+
@Component({
components: {SettingsRow}
})
+
export default class SettingsUiSettingsTab extends Mixins(BaseMixin) {
private defaultLogoColor = defaultLogoColor
private defaultPrimaryColor = defaultPrimaryColor
@@ -151,12 +153,25 @@ export default class SettingsUiSettingsTab extends Mixins(BaseMixin) {
this.$store.dispatch('gui/saveSetting', {name: 'general.confirmOnPowerDeviceChange', value: newVal })
}
- get boolWideNavDrawer() {
- return this.$store.state.gui.dashboard.boolWideNavDrawer ?? false
+ get menuStyleSetting() {
+ return this.$store.state.gui.dashboard.menuStyle
+ }
+
+ set menuStyleSetting(newVal) {
+ this.$store.dispatch('gui/saveSetting', {name: 'dashboard.menuStyle', value: newVal })
}
- set boolWideNavDrawer(newVal) {
- this.$store.dispatch('gui/saveSetting', {name: 'dashboard.boolWideNavDrawer', value: newVal })
+ get menuStyles() {
+ return [
+ {
+ text: this.$t('Settings.UiSettingsTab.MenuStyleIconsOnly'),
+ value: 'iconsOnly'
+ },
+ {
+ text: this.$t('Settings.UiSettingsTab.MenuStyleIconsAndText'),
+ value: 'iconsAndText'
+ }
+ ]
}
get boolHideUploadAndPrintButton() {
diff --git a/src/locales/en.json b/src/locales/en.json
index efcf5fa8b..5f7700ae6 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -670,8 +670,10 @@
"ShowWebcamInNavigation": "Show Webcam in navigation",
"BoolBigThumbnail": "Large thumbnail",
"BoolBigThumbnailDescription": "Display a large thumbnail in the status panel during a print.",
- "BoolWideNavDrawer": "Wide Navigation Drawer",
- "BoolWideNavDrawerDescription": "Display a wider Navigation Toolbar",
+ "MenuStyle": "Style of the side menu",
+ "MenuStyleDescription": "Change the appearance of the side menu",
+ "MenuStyleIconsOnly": "Icons only",
+ "MenuStyleIconsAndText": "Icons + Text",
"BoolHideUploadAndPrintButton": "Hide Upload and Print Button",
"BoolHideUploadAndPrintButtonDescription": "Show or hide the \"Upload and Print\" button in the topbar.",
"DisplayCANCEL_PRINT": "Display CANCEL_PRINT",
diff --git a/src/store/gui/index.ts b/src/store/gui/index.ts
index ba3a436a8..cb12e5c10 100644
--- a/src/store/gui/index.ts
+++ b/src/store/gui/index.ts
@@ -32,6 +32,7 @@ export const getDefaultState = (): GuiState => {
boolTempchart: true,
boolBigThumbnail: true,
boolWideNavDrawer: false,
+ menuStyle: 'iconsOnly',
macroManagement: 'simple',
hiddenMacros: [],
hiddenTempChart: [],