From 88409b93753fe45983b143867678e010c19a3830 Mon Sep 17 00:00:00 2001
From: Zeanon <thezeanon@gmail.com>
Date: Thu, 27 Jul 2023 15:15:11 +0200
Subject: [PATCH] Fixes and stuff

---
 package-lock.json                             |   4 +-
 package.json                                  |   2 +-
 src/App.vue                                   |  75 ++++++-----
 src/components/TheSidebar.vue                 |  10 +-
 src/components/TheTopbar.vue                  |  45 +++++--
 src/components/inputs/CheckboxList.vue        |  67 ++++++++++
 src/components/panels/GcodefilesPanel.vue     |  54 +++++++-
 .../panels/Machine/UpdatePanel/Entry.vue      |  18 ++-
 .../Temperature/TemperaturePanelListItem.vue  |   4 +-
 .../panels/ToolheadControlPanel.vue           |  11 +-
 .../settings/SettingsControlTab.vue           |  13 ++
 .../settings/SettingsGeneralTab.vue           | 107 ++++++++--------
 src/components/settings/SettingsRow.vue       |   5 +-
 .../settings/SettingsUiSettingsTab.vue        | 119 ++++++++++++------
 src/locales/de.json                           |   6 +
 src/locales/en.json                           |   9 +-
 src/locales/fr.json                           |   3 +-
 src/plugins/build-release_info.ts             |   2 +-
 src/store/gui/index.ts                        |   2 +
 src/store/gui/types.ts                        |   2 +
 src/store/mutations.ts                        |   1 +
 21 files changed, 398 insertions(+), 161 deletions(-)
 create mode 100644 src/components/inputs/CheckboxList.vue

diff --git a/package-lock.json b/package-lock.json
index 82137c852..645369d10 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "mainsail",
-    "version": "2.6.1",
+    "version": "2.6.8",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "mainsail",
-            "version": "2.6.1",
+            "version": "2.6.8",
             "dependencies": {
                 "@codemirror/commands": "^6.0.1",
                 "@codemirror/lang-css": "^6.0.0",
diff --git a/package.json b/package.json
index 2f6b3c339..b4ade5e5d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "mainsail",
-    "version": "2.6.7",
+    "version": "2.6.9",
     "private": true,
     "decription": "a klipper web interface",
     "author": {
diff --git a/src/App.vue b/src/App.vue
index 190bae95a..36e3d0dd8 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,37 +1,11 @@
-<style>
-@import './assets/styles/fonts.css';
-@import './assets/styles/toastr.css';
-@import './assets/styles/page.scss';
-@import './assets/styles/sidebar.scss';
-@import './assets/styles/utils.scss';
-@import './assets/styles/updateManager.scss';
-
-:root {
-    --app-height: 100%;
-}
-
-#content {
-    background-attachment: fixed;
-    background-size: cover;
-    background-repeat: no-repeat;
-}
-
-/*noinspection CssUnusedSymbol*/
-.v-btn:not(.v-btn--outlined).primary {
-    /*noinspection CssUnresolvedCustomProperty*/
-    color: var(--v-btn-text-primary);
-}
-</style>
-
 <template>
     <v-app dark :style="cssVars">
         <template v-if="socketIsConnected && guiIsReady">
-            <the-sidebar></the-sidebar>
-            <the-topbar></the-topbar>
-
+            <the-sidebar />
+            <the-topbar />
             <v-main id="content" :style="mainStyle">
                 <v-container id="page-container" fluid class="container px-3 px-sm-6 py-sm-6 mx-auto">
-                    <router-view></router-view>
+                    <router-view />
                 </v-container>
             </v-main>
             <the-service-worker />
@@ -44,8 +18,8 @@
             <the-bed-screws-dialog />
             <the-screws-tilt-adjust-dialog />
         </template>
-        <the-select-printer-dialog v-else-if="instancesDB !== 'moonraker'"></the-select-printer-dialog>
-        <the-connecting-dialog v-else></the-connecting-dialog>
+        <the-select-printer-dialog v-else-if="instancesDB !== 'moonraker'" />
+        <the-connecting-dialog v-else />
     </v-app>
 </template>
 
@@ -105,13 +79,26 @@ export default class App extends Mixins(BaseMixin) {
         return this.$store.getters['files/getMainBackground']
     }
 
+    get naviDrawer(): boolean {
+        return this.$store.state.naviDrawer
+    }
+    get navigationStyle() {
+        return this.$store.state.gui.uiSettings.navigationStyle
+    }
+
     get mainStyle() {
-        let style = ''
+        let style: any = {
+            paddingLeft: '0',
+        }
 
         if (this.mainBackground !== null) {
-            style = 'background-image: url(' + this.mainBackground + ');'
+            style.backgroundImage = 'url(' + this.mainBackground + ')'
         }
 
+        // overwrite padding left for the sidebar
+        if (this.naviDrawer && this.navigationStyle === 'iconsAndText') style.paddingLeft = '220px'
+        if (this.naviDrawer && this.navigationStyle === 'iconsOnly') style.paddingLeft = '56px'
+
         return style
     }
 
@@ -316,3 +303,25 @@ export default class App extends Mixins(BaseMixin) {
     }
 }
 </script>
+
+<style>
+@import './assets/styles/fonts.css';
+@import './assets/styles/toastr.css';
+@import './assets/styles/page.scss';
+@import './assets/styles/sidebar.scss';
+@import './assets/styles/utils.scss';
+@import './assets/styles/updateManager.scss';
+:root {
+    --app-height: 100%;
+}
+#content {
+    background-attachment: fixed;
+    background-size: cover;
+    background-repeat: no-repeat;
+}
+/*noinspection CssUnusedSymbol*/
+.v-btn:not(.v-btn--outlined).primary {
+    /*noinspection CssUnresolvedCustomProperty*/
+    color: var(--v-btn-text-primary);
+}
+</style>
diff --git a/src/components/TheSidebar.vue b/src/components/TheSidebar.vue
index 8050321b2..6be678c99 100644
--- a/src/components/TheSidebar.vue
+++ b/src/components/TheSidebar.vue
@@ -1,7 +1,7 @@
 <template>
     <v-navigation-drawer
         :key="navigationStyle"
-        v-model="naviDrawer"
+        :value="naviDrawer"
         :src="sidebarBackground"
         :mini-variant="navigationStyle === 'iconsOnly'"
         :width="navigationWidth"
@@ -70,10 +70,6 @@ export default class TheSidebar extends Mixins(NavigationMixin, BaseMixin) {
         return this.$store.state.naviDrawer
     }
 
-    set naviDrawer(newVal: boolean) {
-        this.$store.dispatch('setNaviDrawer', newVal)
-    }
-
     get navigationStyle() {
         return this.$store.state.gui.uiSettings.navigationStyle
     }
@@ -133,10 +129,6 @@ export default class TheSidebar extends Mixins(NavigationMixin, BaseMixin) {
 
         return output
     }
-
-    mounted() {
-        this.naviDrawer = this.$vuetify.breakpoint.lgAndUp
-    }
 }
 </script>
 
diff --git a/src/components/TheTopbar.vue b/src/components/TheTopbar.vue
index 41834d69a..e727a613c 100644
--- a/src/components/TheTopbar.vue
+++ b/src/components/TheTopbar.vue
@@ -1,7 +1,7 @@
 <template>
     <div>
         <v-app-bar app elevate-on-scroll :height="topbarHeight" class="topbar pa-0" clipped-left>
-            <v-app-bar-nav-icon tile @click.stop="naviDrawer = !naviDrawer"></v-app-bar-nav-icon>
+            <v-app-bar-nav-icon tile @click.stop="naviDrawer = !naviDrawer" />
             <router-link to="/">
                 <template v-if="sidebarLogo">
                     <img
@@ -17,12 +17,12 @@
                         class="nav-logo ml-4 mr-1 d-none d-sm-flex"
                         router
                         to="/"
-                        :ripple="false"></mainsail-logo>
+                        :ripple="false" />
                 </template>
             </router-link>
             <v-toolbar-title class="text-no-wrap ml-0 pl-2 mr-2">{{ printerName }}</v-toolbar-title>
-            <printer-selector v-if="countPrinters"></printer-selector>
-            <v-spacer></v-spacer>
+            <printer-selector v-if="countPrinters" />
+            <v-spacer />
             <input
                 ref="fileUploadAndStart"
                 type="file"
@@ -66,9 +66,9 @@
                 <v-icon class="mr-md-2">{{ mdiAlertOctagonOutline }}</v-icon>
                 <span class="d-none d-md-inline">{{ $t('App.TopBar.EmergencyStop') }}</span>
             </v-btn>
-            <the-notification-menu></the-notification-menu>
-            <the-settings-menu></the-settings-menu>
-            <the-top-corner-menu></the-top-corner-menu>
+            <the-notification-menu />
+            <the-settings-menu />
+            <the-top-corner-menu />
         </v-app-bar>
         <v-snackbar v-model="uploadSnackbar.status" :timeout="-1" :value="true" fixed right bottom dark>
             <strong>{{ $t('App.TopBar.Uploading') }} {{ uploadSnackbar.filename }}</strong>
@@ -84,7 +84,7 @@
         </v-snackbar>
         <v-dialog v-model="showEmergencyStopDialog" width="400" :fullscreen="isMobile">
             <panel
-                :title="$t('EmergencyStopDialog.EmergencyStop').toString()"
+                :title="$t('EmergencyStopDialog.EmergencyStop')"
                 toolbar-color="error"
                 card-class="emergency-stop-dialog"
                 :icon="mdiAlertOctagonOutline"
@@ -96,7 +96,7 @@
                 </template>
                 <v-card-text>{{ $t('EmergencyStopDialog.AreYouSure') }}</v-card-text>
                 <v-card-actions>
-                    <v-spacer></v-spacer>
+                    <v-spacer />
                     <v-btn text @click="showEmergencyStopDialog = false">{{ $t('EmergencyStopDialog.No') }}</v-btn>
                     <v-btn color="primary" text @click="emergencyStop">{{ $t('EmergencyStopDialog.Yes') }}</v-btn>
                 </v-card-actions>
@@ -245,6 +245,26 @@ export default class TheTopbar extends Mixins(BaseMixin) {
         )
     }
 
+    get defaultNavigationStateSetting() {
+        return this.$store.state.gui?.uiSettings?.defaultNavigationStateSetting ?? 'alwaysOpen'
+    }
+
+    mounted() {
+        //this.naviDrawer = this.$vuetify.breakpoint.lgAndUp
+        switch (this.defaultNavigationStateSetting) {
+            case 'alwaysClosed':
+                this.naviDrawer = false
+                break
+
+            case 'lastState':
+                this.naviDrawer = (localStorage.getItem('naviDrawer') ?? 'true') === 'true'
+                break
+
+            default:
+                this.naviDrawer = this.$vuetify.breakpoint.lgAndUp
+        }
+    }
+
     btnEmergencyStop() {
         const confirmOnEmergencyStop = this.$store.state.gui.uiSettings.confirmOnEmergencyStop
         if (confirmOnEmergencyStop) {
@@ -342,14 +362,13 @@ export default class TheTopbar extends Mixins(BaseMixin) {
 }
 </script>
 
-<style>
+<style scoped>
 /*noinspection CssUnusedSymbol*/
-.topbar .v-toolbar__content {
+::v-deep .topbar .v-toolbar__content {
     padding-top: 0 !important;
     padding-bottom: 0 !important;
 }
-</style>
-<style scoped>
+
 .button-min-width-auto {
     min-width: auto !important;
 }
diff --git a/src/components/inputs/CheckboxList.vue b/src/components/inputs/CheckboxList.vue
new file mode 100644
index 000000000..7e608688a
--- /dev/null
+++ b/src/components/inputs/CheckboxList.vue
@@ -0,0 +1,67 @@
+<template>
+    <v-col class="pl-6">
+        <template v-if="selectAll">
+            <v-checkbox
+                v-model="selectAllModel"
+                :label="selectAllLabel"
+                hide-details
+                class="mt-0"
+                :indeterminate="selectAllIndeterminate"
+                @change="$emit('update:selectedCheckboxes', selectedCheckboxes)"></v-checkbox>
+            <v-divider class="my-2" />
+        </template>
+        <template v-for="option in options">
+            <v-checkbox
+                :key="option.value"
+                v-model="selectedCheckboxes"
+                :label="option.label"
+                hide-details
+                class="mt-0"
+                :value="option.value"
+                @change="$emit('update:selectedCheckboxes', selectedCheckboxes)"></v-checkbox>
+        </template>
+    </v-col>
+</template>
+
+<script lang="ts">
+import { Component, Mixins, Prop } from 'vue-property-decorator'
+import BaseMixin from '../mixins/base'
+import { computed } from 'vue'
+
+@Component
+export default class CheckboxList extends Mixins(BaseMixin) {
+    @Prop({ required: true })
+    declare readonly options: { label: string; value: string }[]
+
+    @Prop({ type: Boolean, required: false, default: false })
+    declare readonly selectAll: boolean
+
+    @Prop({ type: String, required: false, default: '' })
+    declare readonly selectAllLabel: string
+
+    private selectedCheckboxes: string[] = []
+
+    private selectAllIndeterminate: boolean = false
+    selectAllModel = computed<boolean>({
+        get: this.getSelectAll,
+        set: this.setSelectAll,
+    })
+
+    getSelectAll(): boolean {
+        this.selectAllIndeterminate = false
+        if (0 < this.selectedCheckboxes.length && this.selectedCheckboxes.length < this.options.length) {
+            this.selectAllIndeterminate = true
+            return false
+        }
+        return this.selectedCheckboxes.length == this.options.length
+    }
+
+    setSelectAll(state: boolean) {
+        if (state) {
+            this.selectedCheckboxes = this.options.map((o) => o.value)
+        } else {
+            this.selectedCheckboxes = []
+        }
+    }
+}
+</script>
diff --git a/src/components/panels/GcodefilesPanel.vue b/src/components/panels/GcodefilesPanel.vue
index 084d55ce7..941003105 100644
--- a/src/components/panels/GcodefilesPanel.vue
+++ b/src/components/panels/GcodefilesPanel.vue
@@ -143,12 +143,31 @@
             </v-card-text>
             <v-card-text>
                 <v-row>
-                    <v-col class="col-12 py-2 d-flex align-center">
+                    <v-col class="panel-info-bar col-12 py-2 d-flex align-center">
                         <span>
                             <b>{{ $t('Files.CurrentPath') }}:</b>
                             {{ currentPath || '/' }}
                         </span>
                         <v-spacer></v-spacer>
+                        <span class="mr-6">
+                            <b>{{ $t('Files.PrintTime') }}:</b>
+                            {{ getColumnSum('estimated_time') }}
+                        </span>
+                        <template v-if="getColumnSum('filament_weight_total')">
+                            <v-tooltip top>
+                                <template #activator="{ on, attrs }">
+                                    <span class="filament-weight-sum mr-6" v-bind="attrs" v-on="on">
+                                        <b>{{ $t('Files.FilamentWeight') }}:</b>
+                                        {{ getColumnSum('filament_weight_total') }}
+                                    </span>
+                                </template>
+                                <span>
+                                    {{ $t('Files.FilamentWeight') }}: {{ getColumnSum('filament_weight_total') }}
+                                    <br />
+                                    {{ $t('Files.FilamentUsage') }}: {{ getColumnSum('filament_total') }}
+                                </span>
+                            </v-tooltip>
+                        </template>
                         <template v-if="disk_usage !== null">
                             <v-tooltip top>
                                 <template #activator="{ on, attrs }">
@@ -1113,6 +1132,20 @@ export default class GcodefilesPanel extends Mixins(BaseMixin, ControlMixin) {
         return this.$store.getters['server/history/getPrintStatusIconColor'](status)
     }
 
+    getColumnSum(columnValue: string) {
+        const col = this.tableColumns.find((c) => c.value == columnValue)
+        if (col && col.outputType) {
+            let files = this.files
+            if (this.selectedFiles && this.selectedFiles.length > 0) {
+                files = this.selectedFiles
+            }
+            const sum = files.reduce((sum: number, file: FileStateGcodefile) => {
+                return sum + (file[col.value] || 0)
+            }, 0)
+            return this.formatOutputValue(sum, col.outputType)
+        }
+    }
+
     dragOverFilelist(e: any, row: any) {
         e.preventDefault()
 
@@ -1496,9 +1529,12 @@ export default class GcodefilesPanel extends Mixins(BaseMixin, ControlMixin) {
 
     outputValue(col: any, item: FileStateGcodefile) {
         const value = col.value in item ? item[col.value] : null
+        return this.formatOutputValue(value, col.outputType)
+    }
 
+    formatOutputValue(value: any, valueType: string) {
         if (value !== null) {
-            switch (col.outputType) {
+            switch (valueType) {
                 case 'filesize':
                     return formatFilesize(value)
 
@@ -1576,4 +1612,18 @@ export default class GcodefilesPanel extends Mixins(BaseMixin, ControlMixin) {
 .handle {
     cursor: move;
 }
+
+/*noinspection CssUnusedSymbol*/
+@media (max-width: 768px) {
+    .filament-weight-sum {
+        display: none;
+    }
+}
+
+/*noinspection CssUnusedSymbol*/
+@media (max-width: 375px) {
+    .panel-info-bar b {
+        display: block;
+    }
+}
 </style>
diff --git a/src/components/panels/Machine/UpdatePanel/Entry.vue b/src/components/panels/Machine/UpdatePanel/Entry.vue
index 707199e96..53e1e77d7 100644
--- a/src/components/panels/Machine/UpdatePanel/Entry.vue
+++ b/src/components/panels/Machine/UpdatePanel/Entry.vue
@@ -157,7 +157,14 @@ export default class UpdatePanelEntry extends Mixins(BaseMixin) {
     }
 
     get localVersion() {
-        const version = this.repo.version ?? '?'
+        let version = this.repo.version ?? '?'
+        while (version.split(".").length < 3) {
+            let str = version.split('-')
+            version = str[0].concat('.0')
+            for (let i = 1; i < str.length; i++) {
+                version = version.concat('-').concat(str[i])
+            }
+        }
 
         if (!semver.valid(version)) return null
 
@@ -165,7 +172,14 @@ export default class UpdatePanelEntry extends Mixins(BaseMixin) {
     }
 
     get remoteVersion() {
-        const version = this.repo.remote_version ?? '?'
+        let version = this.repo.remote_version ?? '?'
+        while (version.split(".").length < 3) {
+            let str = version.split('-')
+            version = str[0].concat('.0')
+            for (let i = 1; i < str.length; i++) {
+                version = version.concat('-').concat(str[i])
+            }
+        }
 
         if (!semver.valid(version)) return null
 
diff --git a/src/components/panels/Temperature/TemperaturePanelListItem.vue b/src/components/panels/Temperature/TemperaturePanelListItem.vue
index ca7c16542..1234ca89f 100644
--- a/src/components/panels/Temperature/TemperaturePanelListItem.vue
+++ b/src/components/panels/Temperature/TemperaturePanelListItem.vue
@@ -233,7 +233,9 @@ export default class TemperaturePanelListItem extends Mixins(BaseMixin) {
     get rpm() {
         if (!('rpm' in this.printerObject)) return null
 
-        return parseInt(this.printerObject.rpm)
+        let rpmNumber = parseInt(this.printerObject.rpm)
+
+        return isNaN(rpmNumber) ? null : rpmNumber
     }
 
     get rpmClass() {
diff --git a/src/components/panels/ToolheadControlPanel.vue b/src/components/panels/ToolheadControlPanel.vue
index 46dd5df02..4553db398 100644
--- a/src/components/panels/ToolheadControlPanel.vue
+++ b/src/components/panels/ToolheadControlPanel.vue
@@ -94,11 +94,11 @@
         <!-- MOVE TO CONTROL -->
         <move-to-control class="py-0 pt-3"></move-to-control>
         <!-- AXIS CONTROL -->
-        <v-container>
+        <v-container v-if="axisControlVisible">
             <component :is="`${controlStyle}-control`"></component>
         </v-container>
         <!-- Z-OFFSET CONTROL -->
-        <v-divider></v-divider>
+        <v-divider :class="{ 'mt-3': !axisControlVisible }"></v-divider>
         <v-container>
             <zoffset-control></zoffset-control>
         </v-container>
@@ -164,5 +164,12 @@ export default class ToolheadControlPanel extends Mixins(BaseMixin, ControlMixin
     get speedFactor(): number {
         return this.$store.state.printer?.gcode_move?.speed_factor ?? 1
     }
+
+    get isPrinting() {
+        return ['printing'].includes(this.printer_state)
+    }
+    get axisControlVisible() {
+        return !(this.isPrinting && (this.$store.state.gui.control.hideDuringPrint ?? false))
+    }
 }
 </script>
diff --git a/src/components/settings/SettingsControlTab.vue b/src/components/settings/SettingsControlTab.vue
index 5a1fe4ca3..11eea5d10 100644
--- a/src/components/settings/SettingsControlTab.vue
+++ b/src/components/settings/SettingsControlTab.vue
@@ -35,6 +35,12 @@
                         </settings-row>
                         <v-divider class="my-2"></v-divider>
                     </template>
+                    <settings-row
+                        :title="$t('Settings.ControlTab.HideDuringPrint').toString()"
+                        :dynamic-slot-width="true">
+                        <v-switch v-model="hideDuringPrint" hide-details class="mt-0"></v-switch>
+                    </settings-row>
+                    <v-divider class="my-2"></v-divider>
                     <settings-row
                         :title="$t('Settings.ControlTab.EnableXYHoming').toString()"
                         :dynamic-slot-width="true">
@@ -336,6 +342,13 @@ export default class SettingsControlTab extends Mixins(BaseMixin, ControlMixin)
         this.$store.dispatch('gui/saveSetting', { name: 'control.style', value: newVal })
     }
 
+    get hideDuringPrint(): Boolean {
+        return this.$store.state.gui.control.hideDuringPrint ?? false
+    }
+    set hideDuringPrint(newVal) {
+        this.$store.dispatch('gui/saveSetting', { name: 'control.hideDuringPrint', value: newVal })
+    }
+
     get actionOptions() {
         let actions = [
             {
diff --git a/src/components/settings/SettingsGeneralTab.vue b/src/components/settings/SettingsGeneralTab.vue
index d1b7362f0..6d16d8cb6 100644
--- a/src/components/settings/SettingsGeneralTab.vue
+++ b/src/components/settings/SettingsGeneralTab.vue
@@ -102,22 +102,11 @@
                         </v-col>
                     </v-row>
                     <v-row>
-                        <v-col class="pl-6">
-                            <template v-for="db in mainsailKeys">
-                                <v-checkbox
-                                    :key="db.name"
-                                    :label="db.label"
-                                    hide-details
-                                    class="mt-0"
-                                    @change="changeNamespace(db.name)" />
-                            </template>
-                            <v-checkbox
-                                v-if="availableNamespaces.includes('timelapse')"
-                                :label="$t('Settings.GeneralTab.DbTimelapseSettings')"
-                                hide-details
-                                class="mt-0"
-                                @change="changeNamespace('timelapse')" />
-                        </v-col>
+                        <checkbox-list
+                            :options="backupableNamespaces"
+                            select-all
+                            :select-all-label="$t('Settings.GeneralTab.Everything')"
+                            @update:selectedCheckboxes="onSelectBackupCheckboxes"></checkbox-list>
                     </v-row>
                     <v-row>
                         <v-col class="text-center">
@@ -207,16 +196,11 @@
                         </v-col>
                     </v-row>
                     <v-row>
-                        <v-col class="pl-6">
-                            <template v-for="db in restoreableNamespaces">
-                                <v-checkbox
-                                    :key="db.name"
-                                    :label="db.label"
-                                    hide-details
-                                    class="mt-0"
-                                    @change="changeNamespace(db.name)" />
-                            </template>
-                        </v-col>
+                        <checkbox-list
+                            :options="restoreableNamespaces"
+                            select-all
+                            :select-all-label="$t('Settings.GeneralTab.Everything')"
+                            @update:selectedCheckboxes="onSelectRestoreCheckboxes"></checkbox-list>
                     </v-row>
                     <v-row>
                         <v-col class="text-center">
@@ -239,9 +223,10 @@ import SettingsRow from '@/components/settings/SettingsRow.vue'
 import Panel from '@/components/ui/Panel.vue'
 import Vue from 'vue'
 import { mdiCloseThick, mdiHelpCircle } from '@mdi/js'
+import CheckboxList from '@/components/inputs/CheckboxList.vue'
 
 @Component({
-    components: { Panel, SettingsRow },
+    components: { Panel, SettingsRow, CheckboxList },
 })
 export default class SettingsGeneralTab extends Mixins(BaseMixin) {
     mdiHelpCircle = mdiHelpCircle
@@ -251,13 +236,14 @@ export default class SettingsGeneralTab extends Mixins(BaseMixin) {
     private dialogResetMainsail = false
     private dialogRestoreMainsail = false
 
-    private dbCheckboxes: string[] = []
-
-    private restoreableNamespaces: { name: string; label: string }[] = []
+    private restoreableNamespaces: { value: string; label: string }[] = []
     private restoreObjects: any = {}
+    private restoreCheckboxes: string[] = []
 
+    private backupableNamespaces: { value: string; label: string }[] = []
     private mainsailKeys: { name: string; label: string }[] = []
     private availableNamespaces: string[] = []
+    private backupCheckboxes: string[] = []
 
     declare $refs: {
         uploadBackupFile: HTMLInputElement
@@ -511,40 +497,56 @@ export default class SettingsGeneralTab extends Mixins(BaseMixin) {
         }
     }
 
-    changeNamespace(name: string) {
-        if (this.dbCheckboxes.includes(name)) {
-            const index = this.dbCheckboxes.indexOf(name)
-            if (index >= 0) this.dbCheckboxes.splice(index, 1)
-        } else this.dbCheckboxes.push(name)
+    onSelectBackupCheckboxes(backupCheckboxes: string[]) {
+        this.backupCheckboxes = backupCheckboxes
+    }
+    onSelectRestoreCheckboxes(restoreCheckboxes: string[]) {
+        this.restoreCheckboxes = restoreCheckboxes
     }
 
     async resetMainsail() {
-        await this.refreshNamespaces()
-        if (this.availableNamespaces.includes('mainsail')) await this.refreshMainsailKeys()
-        else this.mainsailKeys = []
+        await this.refreshBackupTargets()
 
-        this.dbCheckboxes = []
+        this.backupCheckboxes = []
         this.dialogResetMainsail = true
     }
 
     async resetMainsailAction() {
         await this.$store.dispatch('socket/addLoading', 'resetMainsail')
-        await this.$store.dispatch('gui/resetMoonrakerDB', this.dbCheckboxes)
+        await this.$store.dispatch('gui/resetMoonrakerDB', this.backupCheckboxes)
     }
 
     async backupDb() {
         await this.$store.dispatch('socket/addLoading', 'backupDbButton')
-        await this.refreshNamespaces()
-        if (this.availableNamespaces.includes('mainsail')) await this.refreshMainsailKeys()
-        else this.mainsailKeys = []
+        await this.refreshBackupTargets()
 
-        this.dbCheckboxes = []
+        this.backupCheckboxes = []
         this.dialogBackupMainsail = true
     }
 
+    async refreshBackupTargets() {
+        await this.refreshNamespaces()
+        this.backupableNamespaces = []
+        if (this.availableNamespaces.includes('mainsail')) {
+            await this.refreshMainsailKeys()
+            this.backupableNamespaces.push(
+                ...this.mainsailKeys.map((k) => ({
+                    label: k.label,
+                    value: k.name,
+                }))
+            )
+        }
+        if (this.availableNamespaces.includes('timelapse')) {
+            this.backupableNamespaces.push({
+                value: 'timelapase',
+                label: this.$t('Settings.GeneralTab.DbTimelapseSettings').toString(),
+            })
+        }
+    }
+
     async backupMainsail() {
         await this.$store.dispatch('socket/addLoading', 'backupMainsail')
-        await this.$store.dispatch('gui/backupMoonrakerDB', this.dbCheckboxes)
+        await this.$store.dispatch('gui/backupMoonrakerDB', this.backupCheckboxes)
         await this.$store.dispatch('socket/removeLoading', 'backupMainsail')
         this.dialogBackupMainsail = false
     }
@@ -567,14 +569,19 @@ export default class SettingsGeneralTab extends Mixins(BaseMixin) {
 
                         Object.keys(this.restoreObjects).forEach((tmp: string) => {
                             const namespace = this.availableKeys.find((namespace) => namespace.name === tmp)
-                            const tmpNamespace = namespace ? namespace : { name: tmp, label: tmp }
+                            const tmpNamespace = namespace
+                                ? {
+                                    value: namespace.name,
+                                    label: namespace.label,
+                                }
+                                : { value: tmp, label: tmp }
 
                             this.restoreableNamespaces.push(tmpNamespace)
                         })
 
                         this.restoreableNamespaces = this.restoreableNamespaces.sort((a, b) => {
-                            if (a.name === 'general') return -1
-                            if (b.name === 'general') return 1
+                            if (a.value === 'general') return -1
+                            if (b.value === 'general') return 1
 
                             const stringA = a.label.toString().toLowerCase()
                             const stringB = b.label.toString().toLowerCase()
@@ -585,7 +592,7 @@ export default class SettingsGeneralTab extends Mixins(BaseMixin) {
                             return 0
                         })
 
-                        this.dbCheckboxes = []
+                        this.backupCheckboxes = []
                         this.dialogRestoreMainsail = true
                     } catch (e) {
                         Vue.$toast.error(this.$t('Settings.GeneralTab.CannotReadJson') + '')
@@ -604,7 +611,7 @@ export default class SettingsGeneralTab extends Mixins(BaseMixin) {
         this.$store.dispatch('socket/addLoading', 'restoreDbAction')
 
         this.$store.dispatch('gui/restoreMoonrakerDB', {
-            dbCheckboxes: this.dbCheckboxes,
+            dbCheckboxes: this.restoreCheckboxes,
             restoreObjects: this.restoreObjects,
         })
     }
diff --git a/src/components/settings/SettingsRow.vue b/src/components/settings/SettingsRow.vue
index 179b21e7b..7be3cd5a1 100644
--- a/src/components/settings/SettingsRow.vue
+++ b/src/components/settings/SettingsRow.vue
@@ -23,6 +23,7 @@
 <script lang="ts">
 import { Component, Mixins, Prop } from 'vue-property-decorator'
 import BaseMixin from '../mixins/base'
+import { TranslateResult } from 'vue-i18n'
 
 @Component
 export default class SettingsRow extends Mixins(BaseMixin) {
@@ -33,10 +34,10 @@ export default class SettingsRow extends Mixins(BaseMixin) {
     declare readonly icon: string
 
     @Prop({ required: true })
-    declare readonly title: string
+    declare readonly title: string | TranslateResult
 
     @Prop({ required: false })
-    declare readonly subTitle: string
+    declare readonly subTitle: string | TranslateResult
 
     @Prop({ required: false, default: false })
     declare readonly dynamicSlotWidth: boolean
diff --git a/src/components/settings/SettingsUiSettingsTab.vue b/src/components/settings/SettingsUiSettingsTab.vue
index 91c24c80d..e2386d408 100644
--- a/src/components/settings/SettingsUiSettingsTab.vue
+++ b/src/components/settings/SettingsUiSettingsTab.vue
@@ -2,7 +2,7 @@
     <div>
         <v-card flat>
             <v-card-text>
-                <settings-row :title="$t('Settings.UiSettingsTab.Logo').toString()">
+                <settings-row :title="$t('Settings.UiSettingsTab.Logo')">
                     <v-btn
                         v-if="logoColor.toLowerCase() !== defaultLogoColor.toLowerCase()"
                         small
@@ -19,11 +19,11 @@
                             :value="logoColor"
                             hide-mode-switch
                             mode="rgba"
-                            @update:color="updateLogoColor"></v-color-picker>
+                            @update:color="updateLogoColor" />
                     </v-menu>
                 </settings-row>
                 <v-divider class="my-2" />
-                <settings-row :title="$t('Settings.UiSettingsTab.Primary').toString()">
+                <settings-row :title="$t('Settings.UiSettingsTab.Primary')">
                     <v-btn
                         v-if="primaryColor.toLowerCase() !== defaultPrimaryColor.toLowerCase()"
                         small
@@ -45,8 +45,8 @@
                 </settings-row>
                 <v-divider class="my-2" />
                 <settings-row
-                    :title="$t('Settings.UiSettingsTab.GcodeThumbnails').toString()"
-                    :sub-title="$t('Settings.UiSettingsTab.GcodeThumbnailsDescription').toString()"
+                    :title="$t('Settings.UiSettingsTab.GcodeThumbnails')"
+                    :sub-title="$t('Settings.UiSettingsTab.GcodeThumbnailsDescription')"
                     :dynamic-slot-width="true">
                     <v-btn
                         outlined
@@ -54,27 +54,27 @@
                         color="primary"
                         href="https://docs.mainsail.xyz/overview/features/thumbnails"
                         target="_blank">
-                        {{ $t('Settings.UiSettingsTab.Guide').toString() }}
+                        {{ $t('Settings.UiSettingsTab.Guide') }}
                     </v-btn>
                 </settings-row>
                 <v-divider class="my-2" />
                 <settings-row
-                    :title="$t('Settings.UiSettingsTab.BoolBigThumbnail').toString()"
-                    :sub-title="$t('Settings.UiSettingsTab.BoolBigThumbnailDescription').toString()"
+                    :title="$t('Settings.UiSettingsTab.BoolBigThumbnail')"
+                    :sub-title="$t('Settings.UiSettingsTab.BoolBigThumbnailDescription')"
                     :dynamic-slot-width="true">
                     <v-switch v-model="boolBigThumbnail" hide-details class="mt-0" />
                 </settings-row>
                 <v-divider class="my-2" />
                 <settings-row
-                    :title="$t('Settings.UiSettingsTab.DisplayCANCEL_PRINT').toString()"
-                    :sub-title="$t('Settings.UiSettingsTab.DisplayCANCEL_PRINTDescription').toString()"
+                    :title="$t('Settings.UiSettingsTab.DisplayCANCEL_PRINT')"
+                    :sub-title="$t('Settings.UiSettingsTab.DisplayCANCEL_PRINTDescription')"
                     :dynamic-slot-width="true">
                     <v-switch v-model="displayCancelPrint" hide-details class="mt-0"></v-switch>
                 </settings-row>
                 <v-divider class="my-2" />
                 <settings-row
-                    :title="$t('Settings.UiSettingsTab.LockSliders').toString()"
-                    :sub-title="$t('Settings.UiSettingsTab.LockSlidersDescription').toString()"
+                    :title="$t('Settings.UiSettingsTab.LockSliders')"
+                    :sub-title="$t('Settings.UiSettingsTab.LockSlidersDescription')"
                     :dynamic-slot-width="true">
                     <v-switch v-model="lockSliders" hide-details class="mt-0" />
                 </settings-row>
@@ -82,8 +82,8 @@
                 <v-expand-transition>
                     <settings-row
                         v-show="lockSliders"
-                        :title="$t('Settings.UiSettingsTab.LockSlidersDelay').toString()"
-                        :sub-title="$t('Settings.UiSettingsTab.LockSlidersDelayDescription').toString()"
+                        :title="$t('Settings.UiSettingsTab.LockSlidersDelay')"
+                        :sub-title="$t('Settings.UiSettingsTab.LockSlidersDelayDescription')"
                         :dynamic-slot-width="true">
                         <v-text-field
                             v-model="lockSlidersDelay"
@@ -104,22 +104,22 @@
                 </v-expand-transition>
                 <v-divider v-show="lockSliders" class="my-2" />
                 <settings-row
-                    :title="$t('Settings.UiSettingsTab.ConfirmOnEmergencyStop').toString()"
-                    :sub-title="$t('Settings.UiSettingsTab.ConfirmOnEmergencyStopDescription').toString()"
+                    :title="$t('Settings.UiSettingsTab.ConfirmOnEmergencyStop')"
+                    :sub-title="$t('Settings.UiSettingsTab.ConfirmOnEmergencyStopDescription')"
                     :dynamic-slot-width="true">
                     <v-switch v-model="confirmOnEmergencyStop" hide-details class="mt-0" />
                 </settings-row>
                 <v-divider class="my-2" />
                 <settings-row
-                    :title="$t('Settings.UiSettingsTab.ConfirmOnPowerDeviceChange').toString()"
-                    :sub-title="$t('Settings.UiSettingsTab.ConfirmOnPowerDeviceChangeDescription').toString()"
+                    :title="$t('Settings.UiSettingsTab.ConfirmOnPowerDeviceChange')"
+                    :sub-title="$t('Settings.UiSettingsTab.ConfirmOnPowerDeviceChangeDescription')"
                     :dynamic-slot-width="true">
                     <v-switch v-model="confirmOnPowerDeviceChange" hide-details class="mt-0" />
                 </settings-row>
                 <v-divider class="my-2" />
                 <settings-row
-                    :title="$t('Settings.UiSettingsTab.NavigationStyle').toString()"
-                    :sub-title="$t('Settings.UiSettingsTab.NavigationStyleDescription').toString()">
+                    :title="$t('Settings.UiSettingsTab.NavigationStyle')"
+                    :sub-title="$t('Settings.UiSettingsTab.NavigationStyleDescription')">
                     <v-select
                         v-model="navigationStyleSetting"
                         :items="navigationStyles"
@@ -130,15 +130,27 @@
                 </settings-row>
                 <v-divider class="my-2" />
                 <settings-row
-                    :title="$t('Settings.UiSettingsTab.BoolHideUploadAndPrintButton').toString()"
-                    :sub-title="$t('Settings.UiSettingsTab.BoolHideUploadAndPrintButtonDescription').toString()"
+                    :title="$t('Settings.UiSettingsTab.DefaultNavigationState')"
+                    :sub-title="$t('Settings.UiSettingsTab.DefaultNavigationStateDescription')">
+                    <v-select
+                        v-model="defaultNavigationStateSetting"
+                        :items="defaultNavigationStateSettings"
+                        class="mt-0"
+                        hide-details
+                        outlined
+                        dense />
+                </settings-row>
+                <v-divider class="my-2" />
+                <settings-row
+                    :title="$t('Settings.UiSettingsTab.BoolHideUploadAndPrintButton')"
+                    :sub-title="$t('Settings.UiSettingsTab.BoolHideUploadAndPrintButtonDescription')"
                     :dynamic-slot-width="true">
                     <v-switch v-model="boolHideUploadAndPrintButton" hide-details class="mt-0" />
                 </settings-row>
-                <v-divider class="my-2"></v-divider>
+
                 <settings-row
-                    :title="$t('Settings.UiSettingsTab.PowerDeviceName').toString()"
-                    :sub-title="$t('Settings.UiSettingsTab.PowerDeviceNameDescription').toString()"
+                    :title="$t('Settings.UiSettingsTab.PowerDeviceName')"
+                    :sub-title="$t('Settings.UiSettingsTab.PowerDeviceNameDescription')"
                     :dynamic-slot-width="true">
                     <v-select
                         v-model="powerDeviceName"
@@ -150,43 +162,43 @@
                 </settings-row>
                 <v-divider class="my-2" />
                 <settings-row
-                    :title="$t('Settings.UiSettingsTab.HideSaveConfigButtonForBedMesh').toString()"
-                    :sub-title="$t('Settings.UiSettingsTab.HideSaveConfigButtonForBedMeshDescription').toString()"
+                    :title="$t('Settings.UiSettingsTab.HideSaveConfigButtonForBedMesh')"
+                    :sub-title="$t('Settings.UiSettingsTab.HideSaveConfigButtonForBedMeshDescription')"
                     :dynamic-slot-width="true">
                     <v-switch v-model="hideSaveConfigForBedMash" hide-details class="mt-0" />
                 </settings-row>
                 <v-divider class="my-2" />
                 <settings-row
-                    :title="$t('Settings.UiSettingsTab.DisableFanAnimation').toString()"
-                    :sub-title="$t('Settings.UiSettingsTab.DisableFanAnimationDescription').toString()"
+                    :title="$t('Settings.UiSettingsTab.DisableFanAnimation')"
+                    :sub-title="$t('Settings.UiSettingsTab.DisableFanAnimationDescription')"
                     :dynamic-slot-width="true">
                     <v-switch v-model="disableFanAnimation" hide-details class="mt-0" />
                 </settings-row>
                 <v-divider class="my-2" />
                 <settings-row
-                    :title="$t('Settings.UiSettingsTab.ManualProbeDialog').toString()"
-                    :sub-title="$t('Settings.UiSettingsTab.ManualProbeDialogDescription').toString()"
+                    :title="$t('Settings.UiSettingsTab.ManualProbeDialog')"
+                    :sub-title="$t('Settings.UiSettingsTab.ManualProbeDialogDescription')"
                     :dynamic-slot-width="true">
                     <v-switch v-model="boolManualProbeDialog" hide-details class="mt-0" />
                 </settings-row>
                 <v-divider class="my-2" />
                 <settings-row
-                    :title="$t('Settings.UiSettingsTab.BedScrewsDialog').toString()"
-                    :sub-title="$t('Settings.UiSettingsTab.BedScrewsDialogDescription').toString()"
+                    :title="$t('Settings.UiSettingsTab.BedScrewsDialog')"
+                    :sub-title="$t('Settings.UiSettingsTab.BedScrewsDialogDescription')"
                     :dynamic-slot-width="true">
                     <v-switch v-model="boolBedScrewsDialog" hide-details class="mt-0" />
                 </settings-row>
                 <v-divider class="my-2" />
                 <settings-row
-                    :title="$t('Settings.UiSettingsTab.ScrewsTiltAdjustDialog').toString()"
-                    :sub-title="$t('Settings.UiSettingsTab.ScrewsTiltAdjustDialogDescription').toString()"
+                    :title="$t('Settings.UiSettingsTab.ScrewsTiltAdjustDialog')"
+                    :sub-title="$t('Settings.UiSettingsTab.ScrewsTiltAdjustDialogDescription')"
                     :dynamic-slot-width="true">
                     <v-switch v-model="boolScrewsTiltAdjustDialog" hide-details class="mt-0" />
                 </settings-row>
                 <v-divider class="my-2" />
                 <settings-row
-                    :title="$t('Settings.UiSettingsTab.TempchartHeight').toString()"
-                    :sub-title="$t('Settings.UiSettingsTab.TempchartHeightDescription').toString()">
+                    :title="$t('Settings.UiSettingsTab.TempchartHeight')"
+                    :sub-title="$t('Settings.UiSettingsTab.TempchartHeightDescription')">
                     <v-slider
                         v-model.lazy="tempchartHeight"
                         hide-details
@@ -197,8 +209,8 @@
                 </settings-row>
                 <v-divider class="my-2" />
                 <settings-row
-                    :title="$t('Settings.UiSettingsTab.HideUpdateWarnings').toString()"
-                    :sub-title="$t('Settings.UiSettingsTab.HideUpdateWarningsDescription').toString()"
+                    :title="$t('Settings.UiSettingsTab.HideUpdateWarnings')"
+                    :sub-title="$t('Settings.UiSettingsTab.HideUpdateWarningsDescription')"
                     :dynamic-slot-width="true">
                     <v-switch v-model="hideUpdateWarnings" hide-details class="mt-0" />
                 </settings-row>
@@ -224,8 +236,8 @@ export default class SettingsUiSettingsTab extends Mixins(BaseMixin) {
     mdiRestart = mdiRestart
     mdiTimerOutline = mdiTimerOutline
 
-    private defaultLogoColor = defaultLogoColor
-    private defaultPrimaryColor = defaultPrimaryColor
+    defaultLogoColor = defaultLogoColor
+    defaultPrimaryColor = defaultPrimaryColor
 
     get logoColor() {
         return this.$store.state.gui.uiSettings.logo
@@ -318,6 +330,31 @@ export default class SettingsUiSettingsTab extends Mixins(BaseMixin) {
         ]
     }
 
+    get defaultNavigationStateSetting() {
+        return this.$store.state.gui.uiSettings.defaultNavigationStateSetting
+    }
+
+    set defaultNavigationStateSetting(newVal) {
+        this.$store.dispatch('gui/saveSetting', { name: 'uiSettings.defaultNavigationStateSetting', value: newVal })
+    }
+
+    get defaultNavigationStateSettings() {
+        return [
+            {
+                text: this.$t('Settings.UiSettingsTab.DefaultNavigationStateAlwaysOpen'),
+                value: 'alwaysOpen',
+            },
+            {
+                text: this.$t('Settings.UiSettingsTab.DefaultNavigationStateAlwaysClosed'),
+                value: 'alwaysClosed',
+            },
+            {
+                text: this.$t('Settings.UiSettingsTab.DefaultNavigationStateLastState'),
+                value: 'lastState',
+            },
+        ]
+    }
+
     get boolHideUploadAndPrintButton() {
         return this.$store.state.gui.uiSettings.boolHideUploadAndPrintButton ?? false
     }
diff --git a/src/locales/de.json b/src/locales/de.json
index 6d03a5568..cb033892f 100644
--- a/src/locales/de.json
+++ b/src/locales/de.json
@@ -794,6 +794,7 @@
             "Circle": "Kreis",
             "Control": "Steuerung",
             "Cross": "Kreuz",
+            "HideDuringPrint": "Achsensteuerung während des Drucks ausblenden",
             "EnableXYHoming": "Aktiviere kombiniertes X & Y homing",
             "EstimatedExtrusionInfo": "Zeige Info zur geschätzten Extrusion",
             "EstimatedExtrusionInfoDescription": "Anzeigen/ausblenden der Info zur geschätzten Extrusion, basierend auf Extrusionmenge und Extrusionsgeschwindigkeit",
@@ -1060,6 +1061,11 @@
             "ConfirmOnEmergencyStopDescription": "Zeige vor einem Notstop einen Bestätigungsdialog.",
             "ConfirmOnPowerDeviceChange": "Bestätigung für Änderung der Stromversorgung von Geräten",
             "ConfirmOnPowerDeviceChangeDescription": "Zeige vor Änderung der Stromversorgung von Geräten einen Bestätigungsdialog.",
+            "DefaultNavigationState": "Standard Navigationszustand",
+            "DefaultNavigationStateAlwaysClosed": "immer geschlossen",
+            "DefaultNavigationStateAlwaysOpen": "immer geöffnet",
+            "DefaultNavigationStateDescription": "Welchen zustand soll die Navigation normalerweise haben?",
+            "DefaultNavigationStateLastState": "letzter Zustand",
             "DisableFanAnimation": "Lüfteranimation deaktivieren",
             "DisableFanAnimationDescription": "Dies kann die Last im Browser senken.",
             "DisplayCANCEL_PRINT": "Zeige CANCEL_PRINT an",
diff --git a/src/locales/en.json b/src/locales/en.json
index 9bdd6b0a9..554e2b78d 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -794,6 +794,7 @@
             "Circle": "Circle",
             "Control": "Control",
             "Cross": "Cross",
+            "HideDuringPrint": "Hide axis controls during print",
             "EnableXYHoming": "Enable combined X & Y axes homing",
             "EstimatedExtrusionInfo": "Show estimated extrusion info",
             "EstimatedExtrusionInfoDescription": "Show / Hide info for estimated extrusions based on extrusion amount and feedrate",
@@ -889,7 +890,8 @@
             "Reset": "reset",
             "Restore": "Restore",
             "RestoreDialog": "Please select all the sections you want to restore:",
-            "TimeFormat": "Time Format"
+            "TimeFormat": "Time Format",
+            "Everything": "Everything"
         },
         "InterfaceSettings": "Interface Settings",
         "MacrosTab": {
@@ -1060,6 +1062,11 @@
             "ConfirmOnEmergencyStopDescription": "Show a confirmation dialog on Emergency Stop",
             "ConfirmOnPowerDeviceChange": "Require confirm on Device Power changes",
             "ConfirmOnPowerDeviceChangeDescription": "Show a confirmation dialog on Device Power changes",
+            "DefaultNavigationState": "Navigation default state",
+            "DefaultNavigationStateAlwaysClosed": "always closed",
+            "DefaultNavigationStateAlwaysOpen": "always open",
+            "DefaultNavigationStateDescription": "Which state should have the navigation per default.",
+            "DefaultNavigationStateLastState": "last state",
             "DisableFanAnimation": "Disable fan animation",
             "DisableFanAnimationDescription": "This can reduce some load in your Browser.",
             "DisplayCANCEL_PRINT": "Display CANCEL_PRINT",
diff --git a/src/locales/fr.json b/src/locales/fr.json
index d34b8a059..a4f4b5471 100644
--- a/src/locales/fr.json
+++ b/src/locales/fr.json
@@ -831,7 +831,8 @@
             "12hours": "12-heures ({time})",
             "24hours": "24-heures ({time})",
             "DateFormat": "Format de la date",
-            "TimeFormat": "Format de l'heure"
+            "TimeFormat": "Format de l'heure",
+            "Everything": "Tout"
         },
         "InterfaceSettings": "Réglages interface",
         "MacrosTab": {
diff --git a/src/plugins/build-release_info.ts b/src/plugins/build-release_info.ts
index 7cafea2f9..5eedac269 100644
--- a/src/plugins/build-release_info.ts
+++ b/src/plugins/build-release_info.ts
@@ -20,7 +20,7 @@ export default function buildReleaseInfo(): PluginOption {
                 await releaseInfoFile.writeFile(
                     JSON.stringify({
                         project_name: 'mainsail',
-                        project_owner: 'mainsail-crew',
+                        project_owner: 'LynxCrew',
                         version: `v${versionIdentifier}`,
                     })
                 )
diff --git a/src/store/gui/index.ts b/src/store/gui/index.ts
index 248b2220c..df0f97afa 100644
--- a/src/store/gui/index.ts
+++ b/src/store/gui/index.ts
@@ -30,6 +30,7 @@ export const getDefaultState = (): GuiState => {
         control: {
             style: 'bars',
             actionButton: null,
+            hideDuringPrint: false,
             enableXYHoming: false,
             feedrateXY: 100,
             stepsXY: [100, 10, 1],
@@ -158,6 +159,7 @@ export const getDefaultState = (): GuiState => {
             boolWideNavDrawer: false,
             boolHideUploadAndPrintButton: false,
             navigationStyle: 'iconsAndText',
+            defaultNavigationStateSetting: 'alwaysOpen',
             powerDeviceName: null,
             hideSaveConfigForBedMash: false,
             disableFanAnimation: false,
diff --git a/src/store/gui/types.ts b/src/store/gui/types.ts
index e9a8e2bc5..a2a1d327f 100644
--- a/src/store/gui/types.ts
+++ b/src/store/gui/types.ts
@@ -20,6 +20,7 @@ export interface GuiState {
     console?: GuiConsoleState
     control: {
         style: 'bars' | 'circle' | 'cross'
+        hideDuringPrint: boolean
         actionButton: null | 'm84' | 'qgl' | 'ztilt'
         enableXYHoming: boolean
         feedrateXY: number
@@ -108,6 +109,7 @@ export interface GuiState {
         boolWideNavDrawer: boolean
         boolHideUploadAndPrintButton: boolean
         navigationStyle: 'iconsAndText' | 'iconsOnly'
+        defaultNavigationStateSetting: 'alwaysOpen' | 'alwaysClosed' | 'lastState'
         powerDeviceName: string | null
         hideSaveConfigForBedMash: boolean
         disableFanAnimation: boolean
diff --git a/src/store/mutations.ts b/src/store/mutations.ts
index 1186708d7..6ae477a9e 100644
--- a/src/store/mutations.ts
+++ b/src/store/mutations.ts
@@ -5,6 +5,7 @@ import { RootState } from './types'
 export const mutations: MutationTree<RootState> = {
     setNaviDrawer(state, payload) {
         Vue.set(state, 'naviDrawer', payload)
+        localStorage.setItem('naviDrawer', payload)
     },
 
     setInstancesDB(state, payload) {