From 72657da52cd14c79a681641cb0ce74a36f53c84d Mon Sep 17 00:00:00 2001
From: Zeanon <thezeanon@gmail.com>
Date: Wed, 12 Jun 2024 16:08:45 +0200
Subject: [PATCH] .

---
 package.json                                  |  2 +-
 src/components/TheEditor.vue                  |  6 +-
 .../panels/Machine/SystemPanelHost.vue        |  4 +-
 .../panels/Status/PrintstatusThumbnail.vue    | 57 ++++++++-----
 .../Temperature/TemperaturePanelList.vue      | 24 ++++--
 .../Temperature/TemperaturePanelListItem.vue  | 80 +++++++++----------
 .../Temperature/TemperaturePanelSettings.vue  | 12 +--
 .../settings/SettingsUiSettingsTab.vue        | 70 +++++++++-------
 src/locales/en.json                           | 10 ++-
 src/store/gui/index.ts                        |  3 +-
 src/store/gui/types.ts                        |  3 +-
 src/store/printer/actions.ts                  |  1 +
 src/store/printer/getters.ts                  |  6 +-
 src/store/printer/types.ts                    |  2 +-
 src/store/server/getters.ts                   |  6 +-
 15 files changed, 171 insertions(+), 115 deletions(-)

diff --git a/package.json b/package.json
index d0d9a8472..4c7508dc9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "mainsail",
-    "version": "2.11.5",
+    "version": "2.11.6",
     "private": true,
     "decription": "a klipper web interface",
     "author": {
diff --git a/src/components/TheEditor.vue b/src/components/TheEditor.vue
index 54c355bc1..d8218ec6d 100644
--- a/src/components/TheEditor.vue
+++ b/src/components/TheEditor.vue
@@ -7,7 +7,11 @@
             hide-overlay
             :transition="false"
             @close="close"
-            @keydown.esc="escClose">
+            @keydown.esc="escClose"
+            @keydown.ctrl.shift.s.prevent="restartServiceNameExists && save(restartServiceName)"
+            @keydown.meta.shift.s.prevent="restartServiceNameExists && save(restartServiceName)"
+            @keydown.ctrl.s.prevent="save(null)"
+            @keydown.meta.s.prevent="save(null)">
             <panel
                 card-class="editor-dialog"
                 :icon="isWriteable ? mdiFileDocumentEditOutline : mdiFileDocumentOutline"
diff --git a/src/components/panels/Machine/SystemPanelHost.vue b/src/components/panels/Machine/SystemPanelHost.vue
index affe497bd..fe9a75d54 100644
--- a/src/components/panels/Machine/SystemPanelHost.vue
+++ b/src/components/panels/Machine/SystemPanelHost.vue
@@ -39,7 +39,7 @@
                             {{ $t('Machine.SystemPanel.Values.Load', { load: hostStats.load }) }},
                         </span>
                         <span v-if="hostStats.memoryFormat" class="d-inline-block text-no-wrap">
-                            {{ $t('Machine.SystemPanel.Values.Memory', { memory: hostStats.memoryFormat }) }},
+                            {{ $t('Machine.SystemPanel.Values.Memory', { memory: hostStats.memoryFormat }) }}
                         </span>
                         <span class="text-no-wrap">
                             <template v-if="hostStats.tempSensor">
@@ -51,6 +51,7 @@
                                     <v-tooltip top>
                                         <template #activator="{ on, attrs }">
                                             <span v-bind="attrs" v-on="on">
+                                                ,
                                                 {{
                                                     $t('Machine.SystemPanel.Values.Temp', {
                                                         temp: hostStats.tempSensor.temperature,
@@ -74,6 +75,7 @@
                                     </v-tooltip>
                                 </template>
                                 <span v-else>
+                                    ,
                                     {{
                                         $t('Machine.SystemPanel.Values.Temp', {
                                             temp: hostStats.tempSensor.temperature,
diff --git a/src/components/panels/Status/PrintstatusThumbnail.vue b/src/components/panels/Status/PrintstatusThumbnail.vue
index 43fdf91e5..c62cca33c 100644
--- a/src/components/panels/Status/PrintstatusThumbnail.vue
+++ b/src/components/panels/Status/PrintstatusThumbnail.vue
@@ -8,13 +8,11 @@
             class="d-flex align-end statusPanel-big-thumbnail"
             height="200"
             :style="thumbnailStyle"
-            @focus="focusBigThumbnail"
-            @blur="blurBigThumbnail">
-            <v-card-title
-                class="white--text py-2 px-2"
-                style="background-color: rgba(0, 0, 0, 0.3); backdrop-filter: blur(3px)">
+            @focus="focus = true"
+            @blur="focus = false">
+            <v-card-title class="white--text py-2 px-2 statusPanel-thumbnail-overlay">
                 <v-row>
-                    <v-col style="width: 100px">
+                    <v-col>
                         <span class="subtitle-2 text-truncate px-0 text--disabled d-block">
                             <v-icon small class="mr-2">{{ mdiFileOutline }}</v-icon>
                             {{ current_filename }}
@@ -95,6 +93,9 @@ export default class StatusPanelPrintstatusThumbnail extends Mixins(BaseMixin) {
     mdiFileOutline = mdiFileOutline
     mdiFile = mdiFile
 
+    focus = false
+    thumbnailFactor = 0
+
     declare $refs: {
         bigThumbnail: any
     }
@@ -190,34 +191,43 @@ export default class StatusPanelPrintstatusThumbnail extends Mixins(BaseMixin) {
     }
 
     get thumbnailStyle() {
+        let output: { height: string; backgroundColor?: string } = {
+            height: '200px',
+        }
+        if (!this.printstatusThumbnailZoom) {
+            output.height = '100%'
+        } else if (this.focus && this.thumbnailBlurHeight > 0) {
+            output.height = `${this.thumbnailBlurHeight}px`
+        }
+
         if (defaultBigThumbnailBackground.toLowerCase() !== this.bigThumbnailBackground.toLowerCase()) {
-            return { backgroundColor: this.bigThumbnailBackground }
+            output.backgroundColor = this.bigThumbnailBackground
+            return output
         }
 
-        return {}
+        return output
     }
 
-    focusBigThumbnail() {
-        if (this.$refs.bigThumbnail) {
-            const clientWidth = this.$refs.bigThumbnail.$el.clientWidth
-            const thumbnailWidth = this.thumbnailBigWidth
-            const factor = clientWidth / thumbnailWidth
+    get thumbnailBlurHeight() {
+        if (this.thumbnailFactor === 0) return 0
 
-            this.$refs.bigThumbnail.$el.style.height = (this.thumbnailBigHeight * factor).toFixed() + 'px'
-        }
+        return (this.thumbnailBigHeight * this.thumbnailFactor).toFixed()
     }
 
-    blurBigThumbnail() {
-        if (this.$refs.bigThumbnail) {
-            this.$refs.bigThumbnail.$el.style.height = '200px'
-        }
+    get printstatusThumbnailZoom() {
+        return this.$store.state.gui.uiSettings.printstatusThumbnailZoom ?? true
+    }
+
+    calcThumbnailFactor() {
+        const thumbnailClientWidth = this.$refs.bigThumbnail?.$el.clientWidth ?? 0
+        if (!thumbnailClientWidth || !this.thumbnailBigWidth) this.thumbnailFactor = 0
+        return (this.thumbnailFactor = thumbnailClientWidth / this.thumbnailBigWidth)
     }
 
     @Debounce(200)
     handleResize() {
         this.$nextTick(() => {
-            const isFocused = document.activeElement === this.$refs.bigThumbnail?.$el
-            if (isFocused) this.focusBigThumbnail()
+            this.calcThumbnailFactor()
         })
     }
 }
@@ -231,4 +241,9 @@ export default class StatusPanelPrintstatusThumbnail extends Mixins(BaseMixin) {
 .statusPanel-printstatus-thumbnail {
     position: relative;
 }
+
+.statusPanel-thumbnail-overlay {
+    background-color: rgba(0, 0, 0, 0.3);
+    backdrop-filter: blur(3px);
+}
 </style>
diff --git a/src/components/panels/Temperature/TemperaturePanelList.vue b/src/components/panels/Temperature/TemperaturePanelList.vue
index c8288ed64..bd98f50f9 100644
--- a/src/components/panels/Temperature/TemperaturePanelList.vue
+++ b/src/components/panels/Temperature/TemperaturePanelList.vue
@@ -9,8 +9,8 @@
                     <tr>
                         <th class="icon">&nbsp;</th>
                         <th class="name">{{ $t('Panels.TemperaturePanel.Name') }}</th>
-                        <th v-if="!el.is.mobile && !hidePIDProfiles" class="pid-profile">
-                            {{ $t('Panels.TemperaturePanel.PIDProfile') }}
+                        <th v-if="!el.is.mobile && !hideHeaterProfiles" class="heater-profile">
+                            {{ $t('Panels.TemperaturePanel.HeaterProfile') }}
                         </th>
                         <th v-if="!el.is.mobile" class="state">
                             {{ $t('Panels.TemperaturePanel.State') }}
@@ -76,6 +76,16 @@ export default class TemperaturePanelList extends Mixins(BaseMixin) {
             .sort(this.sortObjectName)
     }
 
+    get blockTemperatures() {
+        return this.available_sensors
+            .filter((fullName: string) => {
+                if (!(fullName.toLowerCase() in (this.$store.state.printer?.configfile?.settings ?? {}))) return false
+                if (!("sensor_type" in (this.$store.state.printer?.configfile?.settings[fullName.toLowerCase()] ?? {}))) return false
+                return this.$store.state.printer?.configfile?.settings[fullName.toLowerCase()]["sensor_type"] == "block_temperature"
+            })
+            .sort(this.sortObjectName)
+    }
+
     get available_sensors() {
         return this.$store.state.printer?.heaters?.available_sensors ?? []
     }
@@ -110,8 +120,8 @@ export default class TemperaturePanelList extends Mixins(BaseMixin) {
         return this.$store.state.gui.view.tempchart.hideMonitors ?? false
     }
 
-    get hidePIDProfiles(): boolean {
-        return this.$store.state.gui.view.tempchart.hidePIDProfiles ?? false
+    get hideHeaterProfiles(): boolean {
+        return this.$store.state.gui.view.tempchart.hideHeaterProfiles ?? false
     }
 
     get temperature_sensors() {
@@ -130,13 +140,13 @@ export default class TemperaturePanelList extends Mixins(BaseMixin) {
                 let name = splits[0]
                 if (splits.length > 1) name = splits[1]
 
-                return !name.startsWith('_')
+                return !name.startsWith('_') && !this.blockTemperatures.includes(fullName)
             })
             .sort(this.sortObjectName)
     }
 
     get heaterObjects() {
-        return [...this.filteredHeaters, ...this.temperature_fans]
+        return [...this.filteredHeaters, ...this.blockTemperatures, ...this.temperature_fans]
     }
 
     get settings() {
@@ -187,7 +197,7 @@ export default class TemperaturePanelList extends Mixins(BaseMixin) {
     text-align: center;
 }
 
-.temperature-panel-table ::v-deep .pid-profile {
+.temperature-panel-table ::v-deep .heater-profile {
     width: 75px;
     text-align: right !important;
 }
diff --git a/src/components/panels/Temperature/TemperaturePanelListItem.vue b/src/components/panels/Temperature/TemperaturePanelListItem.vue
index 5c9c490d5..3c9bc0d75 100644
--- a/src/components/panels/Temperature/TemperaturePanelListItem.vue
+++ b/src/components/panels/Temperature/TemperaturePanelListItem.vue
@@ -8,26 +8,26 @@
         <td class="name">
             <span class="cursor-pointer" @click="showEditDialog = true">{{ formatName }}</span>
         </td>
-        <td v-if="!isResponsiveMobile && !hidePIDProfiles" class="pid-profile">
-            <form @submit.prevent="setPIDProfile"
+        <td v-if="!isResponsiveMobile && !hideHeaterProfiles" class="heater-profile">
+            <form @submit.prevent="setHeaterProfile"
                   @mouseover="focused = true"
                   @mouseleave="focused = false">
                 <v-text-field
-                v-if="loaded_pid_profile !== null"
-                class="_pid-profile-input pr-6"
-                :rules="[rules.pid_profile]"
-                v-model="pid_profile"
+                v-if="loaded_heater_profile !== null"
+                class="_heater-profile-input pr-6"
+                :rules="[rules.heater_profile]"
+                v-model="heater_profile"
                 dense
                 outlined
                 hide-details
                 hide-spin-buttons
-                @blur="pidProfile = loaded_pid_profile"
+                @blur="heaterProfile = loaded_heater_profile"
                 @focus="$event.target.select()">
-                    <template v-if="pid_profile !== 'default' && focused" #append>
+                    <template v-if="heater_profile !== 'default' && focused" #append>
                         <v-btn
                             icon
-                            class="_pid-profile-reset"
-                            @click="resetPIDProfile">
+                            class="_heater-profile-reset"
+                            @click="resetHeaterProfile">
                             <v-icon>{{ mdiRefresh }}</v-icon>
                         </v-btn>
                     </template>
@@ -113,20 +113,20 @@ export default class TemperaturePanelListItem extends Mixins(BaseMixin) {
 
     showEditDialog = false
     focused = false
-    pidProfile = this.printerObject.pid_profile ?? null
+    heaterProfile = this.printerObject.heater_profile ?? null
     heater_name = (this.$store.state.printer?.toolhead?.improved_axes_def && this.objectName.startsWith("extruder"))
         ? "hotend" + this.objectName.replace("extruder", "")
         : this.objectName
 
     private rules = {
-        pid_profile: (value: string) => this.pidProfileAllowed(value) || this.$t('Panels.TemperaturePanel.PIDProfileNotAllowed')
+        heater_profile: (value: string) => this.heaterProfileAllowed(value) || this.$t('Panels.TemperaturePanel.HeaterProfileNotAllowed')
     }
 
-    pidProfileAllowed(name: string) {
+    heaterProfileAllowed(name: string) {
         if (name == 'autotune') return true;
-        const pidProfiles = this.pidProfiles
-        for (let i = 0; i < pidProfiles.length; i++) {
-            if (name == pidProfiles[i]) {
+        const heaterProfiles = this.heaterProfiles
+        for (let i = 0; i < heaterProfiles.length; i++) {
+            if (name == heaterProfiles[i]) {
                 return true
             }
         }
@@ -234,34 +234,34 @@ export default class TemperaturePanelListItem extends Mixins(BaseMixin) {
         return this.printerObject.power ?? this.printerObject.speed ?? null
     }
 
-    set pid_profile(newval: string) {
-        this.pidProfile = newval
+    set heater_profile(newval: string) {
+        this.heaterProfile = newval
     }
 
-    get pid_profile(): string {
-        return this.pidProfile
+    get heater_profile(): string {
+        return this.heaterProfile
     }
 
-    get loaded_pid_profile(): string | null {
-        return this.printerObject.pid_profile ?? null
+    get loaded_heater_profile(): string | null {
+        return this.printerObject.heater_profile ?? null
     }
 
-    get pidProfiles(): string[] {
-        return this.$store.getters['printer/getPIDProfiles']?.get(this.heater_name) ?? {}
+    get heaterProfiles(): string[] {
+        return this.$store.getters['printer/getHeaterProfiles']?.get(this.heater_name) ?? {}
     }
 
-    resetPIDProfile():void {
-        this.pidProfile = "default"
-        this.setPIDProfile()
+    resetHeaterProfile():void {
+        this.heaterProfile = "default"
+        this.setHeaterProfile()
     }
 
-    setPIDProfile():void {
-        if (!this.pidProfileAllowed(this.pidProfile)) {
+    setHeaterProfile():void {
+        if (!this.heaterProfileAllowed(this.heaterProfile)) {
             this.$toast.error(
-                this.$t('Panels.TemperaturePanel.UnknownPIDProfile', { profile: this.pidProfile, heater: this.heater_name }) + ''
+                this.$t('Panels.TemperaturePanel.UnknownHeaterProfile', { profile: this.heaterProfile, heater: this.heater_name }) + ''
             )
         } else {
-            const gcode = 'PID_PROFILE HEATER=' + this.heater_name + ' LOAD=' + this.pidProfile
+            const gcode = 'HEATER_PROFILE HEATER=' + this.heater_name + ' LOAD=' + this.heaterProfile
             this.$store.dispatch('server/addEvent', {
                 message: gcode,
                 type: 'command',
@@ -270,9 +270,9 @@ export default class TemperaturePanelListItem extends Mixins(BaseMixin) {
         }
     }
 
-    @Watch('loaded_pid_profile')
-    pidProfileChanged(newVal: any): void {
-        this.pidProfile = this.printerObject.pid_profile
+    @Watch('loaded_heater_profile')
+    heaterProfileChanged(newVal: any): void {
+        this.heaterProfile = this.printerObject.heater_profile
     }
 
     get formatState() {
@@ -375,8 +375,8 @@ export default class TemperaturePanelListItem extends Mixins(BaseMixin) {
         return ''
     }
 
-    get hidePIDProfiles(): boolean {
-        return this.$store.state.gui.view.tempchart.hidePIDProfiles ?? false
+    get hideHeaterProfiles(): boolean {
+        return this.$store.state.gui.view.tempchart.hideHeaterProfiles ?? false
     }
 }
 </script>
@@ -390,26 +390,26 @@ export default class TemperaturePanelListItem extends Mixins(BaseMixin) {
     cursor: pointer;
 }
 
-._pid-profile-input {
+._heater-profile-input {
     min-width: 4.2rem;
     max-width: 8rem;
     padding-right: 0 !important;
 }
 
-._pid-profile-input >>> .v-input__slot {
+._heater-profile-input >>> .v-input__slot {
     min-height: 1rem !important;
     padding-left: 8px !important;
     padding-right: 8px !important;
 }
 
-._pid-profile-input >>> .v-text-field__slot input {
+._heater-profile-input >>> .v-text-field__slot input {
     text-align: center !important;
     padding-top: 4px;
     padding-bottom: 4px;
     min-width: 4rem;
 }
 
-._pid-profile-reset {
+._heater-profile-reset {
     margin-top: -6px;
     margin-left: -4px;
     margin-right: -4px;
diff --git a/src/components/panels/Temperature/TemperaturePanelSettings.vue b/src/components/panels/Temperature/TemperaturePanelSettings.vue
index e931fd889..b88e44e14 100644
--- a/src/components/panels/Temperature/TemperaturePanelSettings.vue
+++ b/src/components/panels/Temperature/TemperaturePanelSettings.vue
@@ -29,10 +29,10 @@
             </v-list-item>
             <v-list-item class="minHeight36">
                 <v-checkbox
-                    v-model="hidePIDProfiles"
+                    v-model="hideHeaterProfiles"
                     class="mt-0"
                     hide-details
-                    :label="$t('Panels.TemperaturePanel.HidePIDProfiles')" />
+                    :label="$t('Panels.TemperaturePanel.HideHeaterProfiles')" />
             </v-list-item>
             <v-list-item class="minHeight36">
                 <v-checkbox
@@ -87,12 +87,12 @@ export default class TemperaturePanelSettings extends Mixins(BaseMixin) {
         this.$store.dispatch('gui/saveSetting', { name: 'view.tempchart.hideMonitors', value: newVal })
     }
 
-    get hidePIDProfiles(): boolean {
-        return this.$store.state.gui.view.tempchart.hidePIDProfiles ?? false
+    get hideHeaterProfiles(): boolean {
+        return this.$store.state.gui.view.tempchart.hideHeaterProfiles ?? false
     }
 
-    set hidePIDProfiles(newVal: boolean) {
-        this.$store.dispatch('gui/saveSetting', { name: 'view.tempchart.hidePIDProfiles', value: newVal })
+    set hideHeaterProfiles(newVal: boolean) {
+        this.$store.dispatch('gui/saveSetting', { name: 'view.tempchart.hideHeaterProfiles', value: newVal })
     }
 }
 </script>
diff --git a/src/components/settings/SettingsUiSettingsTab.vue b/src/components/settings/SettingsUiSettingsTab.vue
index 6c8968224..cbc4122ef 100644
--- a/src/components/settings/SettingsUiSettingsTab.vue
+++ b/src/components/settings/SettingsUiSettingsTab.vue
@@ -70,32 +70,41 @@
                     :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.BigThumbnailBackground')">
-                    <v-btn
-                        v-if="bigThumbnailBackground.toLowerCase() !== defaultBigThumbnailBackground.toLowerCase()"
-                        small
-                        text
-                        class="minwidth-0"
-                        @click="bigThumbnailBackground = defaultBigThumbnailBackground">
-                        <v-icon small>{{ mdiRestart }}</v-icon>
-                    </v-btn>
-                    <v-menu bottom left offset-y :close-on-content-click="false">
-                        <template #activator="{ on, attrs }">
-                            <v-btn
-                                v-bind="attrs"
-                                :color="bigThumbnailBackground"
-                                class="minwidth-0 px-5"
-                                small
-                                v-on="on" />
-                        </template>
-                        <v-color-picker
-                            :value="bigThumbnailBackground"
-                            hide-mode-switch
-                            mode="rgba"
-                            @update:color="updateBigThumbnailBackground" />
-                    </v-menu>
-                </settings-row>
+                <template v-if="boolBigThumbnail">
+                    <v-divider class="my-2" />
+                    <settings-row
+                        :title="$t('Settings.UiSettingsTab.PrintstatusThumbnailZoom')"
+                        :sub-title="$t('Settings.UiSettingsTab.PrintstatusThumbnailZoomDescription')"
+                        :dynamic-slot-width="true">
+                        <v-switch v-model="printstatusThumbnailZoom" hide-details class="mt-0" />
+                    </settings-row>
+                    <v-divider class="my-2" />
+                    <settings-row :title="$t('Settings.UiSettingsTab.BigThumbnailBackground')">
+                        <v-btn
+                            v-if="bigThumbnailBackground.toLowerCase() !== defaultBigThumbnailBackground.toLowerCase()"
+                            small
+                            text
+                            class="minwidth-0"
+                            @click="bigThumbnailBackground = defaultBigThumbnailBackground">
+                            <v-icon small>{{ mdiRestart }}</v-icon>
+                        </v-btn>
+                        <v-menu bottom left offset-y :close-on-content-click="false">
+                            <template #activator="{ on, attrs }">
+                                <v-btn
+                                    v-bind="attrs"
+                                    :color="bigThumbnailBackground"
+                                    class="minwidth-0 px-5"
+                                    small
+                                    v-on="on" />
+                            </template>
+                            <v-color-picker
+                                :value="bigThumbnailBackground"
+                                hide-mode-switch
+                                mode="rgba"
+                                @update:color="updateBigThumbnailBackground" />
+                        </v-menu>
+                    </settings-row>
+                </template>
                 <v-divider class="my-2" />
                 <settings-row
                     :title="$t('Settings.UiSettingsTab.DisplayCANCEL_PRINT')"
@@ -399,7 +408,7 @@ export default class SettingsUiSettingsTab extends Mixins(BaseMixin) {
     set confirmOnShutdown(newVal) {
         this.$store.dispatch('gui/saveSetting', { name: 'uiSettings.confirmOnShutdown', value: newVal })
     }
-    
+
     get confirmOnCoolDown() {
         return this.$store.state.gui.uiSettings.confirmOnCoolDown
     }
@@ -566,6 +575,13 @@ export default class SettingsUiSettingsTab extends Mixins(BaseMixin) {
         this.$store.dispatch('gui/saveSetting', { name: 'uiSettings.boolScrewsTiltAdjustDialog', value: newVal })
     }
 
+    get printstatusThumbnailZoom() {
+        return this.$store.state.gui.uiSettings.printstatusThumbnailZoom ?? true
+    }
+    set printstatusThumbnailZoom(newVal) {
+        this.$store.dispatch('gui/saveSetting', { name: 'uiSettings.printstatusThumbnailZoom', value: newVal })
+    }
+
     get tempchartHeight() {
         return this.$store.state.gui.uiSettings.tempchartHeight ?? 250
     }
diff --git a/src/locales/en.json b/src/locales/en.json
index 46ea2dfc4..47464d100 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -804,7 +804,7 @@
             "Headline": "Temperatures",
             "HideMcuHostSensors": "Hide Host/MCU Sensors",
             "HideMonitors": "Hide Monitors",
-            "HidePIDProfiles": "Hide PID-Profiles",
+            "HideHeaterProfiles": "Hide Heater Profiles",
             "Max": "max",
             "Min": "min",
             "Name": "Name",
@@ -814,9 +814,9 @@
             "ShowNameInChart": "Show {name} in chart",
             "ShowNameInList": "Show {name} in list",
             "DisplayName": "Display name",
-            "PIDProfile": "PID-Profile",
-            "UnknownPIDProfile": "Unknown PID-Profile [{profile}] for Heater [{heater}]",
-            "PIDProfileNotAllowed": "PID-Profile does not exist",
+            "HeaterProfile": "PID-Profile",
+            "UnknownHeaterProfile": "Unknown PID-Profile [{profile}] for Heater [{heater}]",
+            "HeaterProfileNotAllowed": "PID-Profile does not exist",
             "State": "State",
             "Target": "Target",
             "TemperaturesInChart": "Temperature [°C]",
@@ -1301,6 +1301,8 @@
             "PowerDeviceName": "Printer power device",
             "PowerDeviceNameDescription": "Select which Moonraker power device should be used to power on the printer.",
             "Primary": "Primary",
+            "PrintstatusThumbnailZoom": "Large thumbnail zoom",
+            "PrintstatusThumbnailZoomDescription": "This will deactivate the zoom effect on the thumbnail in the status panel.",
             "ProgressAsFavicon": "Show progress as favicon",
             "ProgressAsFaviconDescription": "Change the Mainsail logo favicon to a progress circle.",
             "ScrewsTiltAdjustDialog": "Screws Tilt Adjust Dialog",
diff --git a/src/store/gui/index.ts b/src/store/gui/index.ts
index ba89ed09b..81a3ecc0a 100644
--- a/src/store/gui/index.ts
+++ b/src/store/gui/index.ts
@@ -182,6 +182,7 @@ export const getDefaultState = (): GuiState => {
             tempchartHeight: 250,
             hideUpdateWarnings: false,
             hideUpdateAnomalies: false,
+            printstatusThumbnailZoom: true,
             showRealPWM: false,
             hideMiscellaneousLight: false,
             showStateOnDisabled: true,
@@ -272,7 +273,7 @@ export const getDefaultState = (): GuiState => {
                 hiddenDataset: [],
                 hideMcuHostSensors: false,
                 hideMonitors: false,
-                hidePIDProfiles: false,
+                hideHeaterProfiles: false,
                 autoscale: false,
                 datasetSettings: {},
             },
diff --git a/src/store/gui/types.ts b/src/store/gui/types.ts
index 2bd713ada..aeb25d43d 100644
--- a/src/store/gui/types.ts
+++ b/src/store/gui/types.ts
@@ -130,6 +130,7 @@ export interface GuiState {
         tempchartHeight: number
         hideUpdateWarnings: boolean
         hideUpdateAnomalies: boolean
+        printstatusThumbnailZoom: boolean
         showRealPWM: boolean
         hideMiscellaneousLight: boolean
         showStateOnDisabled: boolean
@@ -196,7 +197,7 @@ export interface GuiState {
             hiddenDataset: string[]
             hideMcuHostSensors: boolean
             hideMonitors: boolean
-            hidePIDProfiles: boolean
+            hideHeaterProfiles: boolean
             autoscale: boolean
             datasetSettings: any
         }
diff --git a/src/store/printer/actions.ts b/src/store/printer/actions.ts
index a2af4be52..646953616 100644
--- a/src/store/printer/actions.ts
+++ b/src/store/printer/actions.ts
@@ -37,6 +37,7 @@ export const actions: ActionTree<PrinterState, RootState> = {
         )
 
         commit('setData', {
+            app_name: payload.app ?? null,
             hostname: payload.hostname,
             software_version: payload.software_version,
             cpu_info: payload.cpu_info,
diff --git a/src/store/printer/getters.ts b/src/store/printer/getters.ts
index 7e8e319f5..1e031dd64 100644
--- a/src/store/printer/getters.ts
+++ b/src/store/printer/getters.ts
@@ -230,7 +230,7 @@ export const getters: GetterTree<PrinterState, RootState> = {
         return caseInsensitiveSort(array, 'name')
     },
 
-    getPIDProfiles: (state, getters) => {
+    getHeaterProfiles: (state, getters) => {
         const profiles: Map<String, string[]> = new Map()
         const config = state.configfile?.config ?? {}
         const availableHeaters = state.heaters?.available_heaters ?? []
@@ -241,9 +241,9 @@ export const getters: GetterTree<PrinterState, RootState> = {
             profiles.set(heater_name, ["default"])
         }
         Object.keys(config)
-            .filter((prop) => prop.startsWith('pid_profile'))
+            .filter((prop) => prop.startsWith('heater_profile'))
             .forEach((prop) => {
-                const profile = prop.replace('pid_profile ', '').split(' ')
+                const profile = prop.replace('heater_profile ', '').split(' ')
                 if (profiles.has(profile[0])) {
                     profiles.get(profile[0])?.push(
                         profile[1]
diff --git a/src/store/printer/types.ts b/src/store/printer/types.ts
index aea2e6e95..2ebc0a310 100644
--- a/src/store/printer/types.ts
+++ b/src/store/printer/types.ts
@@ -34,7 +34,7 @@ export interface PrinterStateHeater {
     temperature: number
     additionalSensors: PrinterStateAdditionalSensor[]
     power: number
-    pid_profile: string
+    heater_profile: string
     avgPower: number
     chartColor: string
     chartSeries: string[]
diff --git a/src/store/server/getters.ts b/src/store/server/getters.ts
index d10bd4000..70decaaed 100644
--- a/src/store/server/getters.ts
+++ b/src/store/server/getters.ts
@@ -77,6 +77,10 @@ export const getters: GetterTree<ServerState, any> = {
                 version = rootState.printer?.software_version.split('-').slice(0, 4).join('-')
             }
 
+            if (rootState.printer?.app_name) {
+                version = rootState.printer?.app_name + ' ' + version
+            }
+
             let pythonVersion: null | string = null
             if (state.system_info?.python?.version_string) {
                 const firstSpace = state.system_info?.python?.version_string.indexOf(' ')
@@ -108,7 +112,7 @@ export const getters: GetterTree<ServerState, any> = {
             else if (memUsage && memUsage > 80) memUsageColor = 'warning'
 
             let tempSensor = rootGetters['printer/getHostTempSensor']
-            if (tempSensor === null) {
+            if (tempSensor === null && state.cpu_temp !== null) {
                 tempSensor = {
                     temperature: state.cpu_temp?.toFixed(0),
                     measured_min_temp: null,