From 2869db0e9b6f962b7be7da9feb43f6bc0775bda5 Mon Sep 17 00:00:00 2001
From: Stefan Dej <meteyou@gmail.com>
Date: Sun, 29 Oct 2023 15:33:17 +0100
Subject: [PATCH 1/4] refactor: refactor SettingsControlTab

Signed-off-by: Stefan Dej <meteyou@gmail.com>
---
 .../settings/SettingsControlTab.vue           | 436 ++++++++----------
 1 file changed, 195 insertions(+), 241 deletions(-)

diff --git a/src/components/settings/SettingsControlTab.vue b/src/components/settings/SettingsControlTab.vue
index beb938e53..b86e16d43 100644
--- a/src/components/settings/SettingsControlTab.vue
+++ b/src/components/settings/SettingsControlTab.vue
@@ -1,223 +1,121 @@
-<style scoped></style>
-
 <template>
-    <div>
-        <v-card flat>
-            <v-card-text>
-                <v-form ref="formControlExtruder">
-                    <!-- TOOLHEAD CONTROL SETTINGS -->
-                    <div class="d-flex align-center">
-                        <v-icon style="opacity: 0.7">{{ mdiGamepad }}</v-icon>
-                        <v-card-title class="mx-n2">
-                            {{ $t('Panels.ToolheadControlPanel.Headline') }}
-                        </v-card-title>
-                        <v-divider class="ml-3"></v-divider>
-                    </div>
-                    <settings-row :title="$t('Settings.ControlTab.Style').toString()">
-                        <v-select
-                            v-model="controlStyle"
-                            :items="controlStyles"
-                            outlined
-                            dense
-                            hide-details
-                            attach></v-select>
+    <v-card flat>
+        <v-card-text>
+            <v-form ref="formControlExtruder">
+                <!-- TOOLHEAD CONTROL SETTINGS -->
+                <div class="d-flex align-center">
+                    <v-icon style="opacity: 0.7">{{ mdiGamepad }}</v-icon>
+                    <v-card-title class="mx-n2">
+                        {{ $t('Panels.ToolheadControlPanel.Headline') }}
+                    </v-card-title>
+                    <v-divider class="ml-3" />
+                </div>
+                <settings-row :title="$t('Settings.ControlTab.Style')">
+                    <v-select v-model="controlStyle" :items="controlStyles" outlined dense hide-details attach />
+                </settings-row>
+                <v-divider class="my-2" />
+                <template v-if="['circle', 'cross'].includes(controlStyle) && actionOptions.length > 1">
+                    <settings-row :title="'Overwrite action button'">
+                        <v-select v-model="actionButton" :items="actionOptions" outlined dense hide-details attach />
                     </settings-row>
-                    <v-divider class="my-2"></v-divider>
-                    <template v-if="['circle', 'cross'].includes(controlStyle) && actionOptions.length > 1">
-                        <settings-row :title="'Overwrite action button'">
-                            <v-select
-                                v-model="actionButton"
-                                :items="actionOptions"
-                                outlined
-                                dense
-                                hide-details
-                                attach></v-select>
-                        </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>
+                    <v-divider class="my-2" />
+                </template>
+                <settings-row :title="$t('Settings.ControlTab.HideDuringPrint')" :dynamic-slot-width="true">
+                    <v-switch v-model="hideDuringPrint" hide-details class="mt-0" />
+                </settings-row>
+                <v-divider class="my-2" />
+                <settings-row :title="$t('Settings.ControlTab.EnableXYHoming')" :dynamic-slot-width="true">
+                    <v-switch v-model="enableXYHoming" hide-details class="mt-0" />
+                </settings-row>
+                <v-divider class="my-2" />
+                <template v-if="['circle', 'cross'].includes(controlStyle)">
+                    <settings-row :title="$t('Settings.ControlTab.InvertXMovement')" :dynamic-slot-width="true">
+                        <v-switch v-model="reverseX" hide-details class="mt-0" />
                     </settings-row>
-                    <v-divider class="my-2"></v-divider>
-                    <settings-row
-                        :title="$t('Settings.ControlTab.EnableXYHoming').toString()"
-                        :dynamic-slot-width="true">
-                        <v-switch v-model="enableXYHoming" hide-details class="mt-0"></v-switch>
+                    <v-divider class="my-2" />
+                    <settings-row :title="$t('Settings.ControlTab.InvertYMovement')" :dynamic-slot-width="true">
+                        <v-switch v-model="reverseY" hide-details class="mt-0" />
+                    </settings-row>
+                    <v-divider class="my-2" />
+                    <settings-row :title="$t('Settings.ControlTab.InvertZMovement')" :dynamic-slot-width="true">
+                        <v-switch v-model="reverseZ" hide-details class="mt-0" />
                     </settings-row>
                     <v-divider class="my-2"></v-divider>
-                    <template v-if="['circle', 'cross'].includes(controlStyle)">
-                        <settings-row
-                            :title="$t('Settings.ControlTab.InvertXMovement').toString()"
-                            :dynamic-slot-width="true">
-                            <v-switch v-model="reverseX" hide-details class="mt-0"></v-switch>
-                        </settings-row>
-                        <v-divider class="my-2"></v-divider>
-                        <settings-row
-                            :title="$t('Settings.ControlTab.InvertYMovement').toString()"
-                            :dynamic-slot-width="true">
-                            <v-switch v-model="reverseY" hide-details class="mt-0"></v-switch>
-                        </settings-row>
-                        <v-divider class="my-2"></v-divider>
-                        <settings-row
-                            :title="$t('Settings.ControlTab.InvertZMovement').toString()"
-                            :dynamic-slot-width="true">
-                            <v-switch v-model="reverseZ" hide-details class="mt-0"></v-switch>
-                        </settings-row>
-                        <v-divider class="my-2"></v-divider>
-                    </template>
-                    <settings-row :title="$t('Settings.ControlTab.SpeedXY').toString()">
-                        <v-text-field
-                            v-model="feedrateXY"
-                            type="number"
-                            suffix="mm/s"
+                </template>
+                <settings-row :title="$t('Settings.ControlTab.SpeedXY')">
+                    <v-text-field
+                        v-model="feedrateXY"
+                        type="number"
+                        suffix="mm/s"
+                        hide-details="auto"
+                        :rules="[(v) => v > 0 || $t('Settings.ControlTab.ValueGreaterThan', { value: '0' })]"
+                        outlined
+                        dense
+                        hide-spin-buttons
+                        @blur="blurFeedrateXY" />
+                </settings-row>
+                <v-divider class="my-2" />
+                <settings-row :title="$t('Settings.ControlTab.SpeedZ')">
+                    <v-text-field
+                        v-model="feedrateZ"
+                        type="number"
+                        suffix="mm/s"
+                        hide-details="auto"
+                        :rules="[(v) => v > 0 || $t('Settings.ControlTab.ValueGreaterThan', { value: '0' })]"
+                        outlined
+                        dense
+                        hide-spin-buttons
+                        @blur="blurFeedrateZ" />
+                </settings-row>
+                <v-divider class="my-2" />
+                <!-- CONTROL STYLE CROSS SPECIFICS -->
+                <template v-if="controlStyle === 'cross'">
+                    <settings-row :title="$t('Settings.ControlTab.MoveDistancesInMm')" :mobile-second-row="true">
+                        <v-combobox
+                            v-model="stepsAll"
+                            hide-selected
                             hide-details="auto"
-                            :rules="[(v) => v > 0 || $t('Settings.ControlTab.ValueGreaterThan', { value: '0' })]"
-                            outlined
+                            multiple
+                            small-chips
+                            :deletable-chips="true"
+                            append-icon=""
+                            type="number"
+                            :rules="[
+                                (v) => v.length > 0 || $t('Settings.ControlTab.MinimumValues', { minimum: '1' }),
+                                (v) =>
+                                    v.length <= 9 ||
+                                    $t('Settings.ControlTab.MaximumValuesVisibility', { maximum: '9' }),
+                            ]"
                             dense
-                            hide-spin-buttons
-                            @blur="blurFeedrateXY"></v-text-field>
+                            outlined
+                            hide-spin-buttons />
                     </settings-row>
-                    <v-divider class="my-2"></v-divider>
-                    <settings-row :title="$t('Settings.ControlTab.SpeedZ').toString()">
-                        <v-text-field
-                            v-model="feedrateZ"
-                            type="number"
-                            suffix="mm/s"
+                    <v-divider class="my-2" />
+                </template>
+                <!-- CONTROL STYLE CIRCLE SPECIFICS -->
+                <template v-else-if="controlStyle === 'circle'">
+                    <settings-row :title="$t('Settings.ControlTab.MoveDistancesXYInMm')" :mobile-second-row="true">
+                        <v-combobox
+                            v-model="stepsCircleXY"
+                            hide-selected
                             hide-details="auto"
-                            :rules="[(v) => v > 0 || $t('Settings.ControlTab.ValueGreaterThan', { value: '0' })]"
-                            outlined
+                            multiple
+                            small-chips
+                            :deletable-chips="true"
+                            append-icon=""
+                            type="number"
+                            :rules="[
+                                (v) => v.length > 0 || $t('Settings.ControlTab.MinimumValues', { minimum: '1' }),
+                                (v) => v.length <= 4 || $t('Settings.ControlTab.MaximumValues', { maximum: '4' }),
+                            ]"
                             dense
-                            hide-spin-buttons
-                            @blur="blurFeedrateZ"></v-text-field>
+                            outlined
+                            hide-spin-buttons />
                     </settings-row>
-                    <v-divider class="my-2"></v-divider>
-                    <!-- CONTROL STYLE CROSS SPECIFICS -->
-                    <template v-if="controlStyle === 'cross'">
-                        <settings-row
-                            :title="$t('Settings.ControlTab.MoveDistancesInMm').toString()"
-                            :mobile-second-row="true">
-                            <v-combobox
-                                v-model="stepsAll"
-                                hide-selected
-                                hide-details="auto"
-                                multiple
-                                small-chips
-                                :deletable-chips="true"
-                                append-icon=""
-                                type="number"
-                                :rules="[
-                                    (v) => v.length > 0 || $t('Settings.ControlTab.MinimumValues', { minimum: '1' }),
-                                    (v) =>
-                                        v.length <= 9 ||
-                                        $t('Settings.ControlTab.MaximumValuesVisibility', { maximum: '9' }),
-                                ]"
-                                dense
-                                outlined
-                                hide-spin-buttons></v-combobox>
-                        </settings-row>
-                        <v-divider class="my-2"></v-divider>
-                    </template>
-                    <!-- CONTROL STYLE CIRCLE SPECIFICS -->
-                    <template v-else-if="controlStyle === 'circle'">
-                        <settings-row
-                            :title="$t('Settings.ControlTab.MoveDistancesXYInMm').toString()"
-                            :mobile-second-row="true">
-                            <v-combobox
-                                v-model="stepsCircleXY"
-                                hide-selected
-                                hide-details="auto"
-                                multiple
-                                small-chips
-                                :deletable-chips="true"
-                                append-icon=""
-                                type="number"
-                                :rules="[
-                                    (v) => v.length > 0 || $t('Settings.ControlTab.MinimumValues', { minimum: '1' }),
-                                    (v) => v.length <= 4 || $t('Settings.ControlTab.MaximumValues', { maximum: '4' }),
-                                ]"
-                                dense
-                                outlined
-                                hide-spin-buttons></v-combobox>
-                        </settings-row>
-                        <v-divider class="my-2"></v-divider>
-                        <settings-row
-                            :title="$t('Settings.ControlTab.MoveDistancesZInMm').toString()"
-                            :mobile-second-row="true">
-                            <v-combobox
-                                v-model="stepsCircleZ"
-                                hide-selected
-                                hide-details="auto"
-                                multiple
-                                small-chips
-                                :deletable-chips="true"
-                                append-icon=""
-                                type="number"
-                                :rules="[
-                                    (v) => v.length > 0 || $t('Settings.ControlTab.MinimumValues', { minimum: '1' }),
-                                    (v) => v.length <= 4 || $t('Settings.ControlTab.MaximumValues', { maximum: '4' }),
-                                ]"
-                                dense
-                                outlined
-                                hide-spin-buttons></v-combobox>
-                        </settings-row>
-                        <v-divider class="my-2"></v-divider>
-                    </template>
-                    <!-- CONTROL STYLE BARS SPECIFICS -->
-                    <template v-else>
-                        <settings-row
-                            :title="$t('Settings.ControlTab.MoveDistancesXYInMm').toString()"
-                            :mobile-second-row="true">
-                            <v-combobox
-                                v-model="stepsXY"
-                                hide-selected
-                                hide-details="auto"
-                                multiple
-                                small-chips
-                                :deletable-chips="true"
-                                append-icon=""
-                                type="number"
-                                :rules="[
-                                    (v) => v.length > 0 || $t('Settings.ControlTab.MinimumValues', { minimum: '1' }),
-                                    (v) =>
-                                        v.length <= 3 ||
-                                        $t('Settings.ControlTab.MaximumValuesVisibility', { maximum: '3' }),
-                                ]"
-                                dense
-                                outlined
-                                hide-spin-buttons></v-combobox>
-                        </settings-row>
-                        <v-divider class="my-2"></v-divider>
-                        <settings-row
-                            :title="$t('Settings.ControlTab.MoveDistancesZInMm').toString()"
-                            :mobile-second-row="true">
-                            <v-combobox
-                                v-model="stepsZ"
-                                hide-selected
-                                hide-details="auto"
-                                multiple
-                                small-chips
-                                :deletable-chips="true"
-                                append-icon=""
-                                type="number"
-                                :rules="[
-                                    (v) => v.length > 0 || $t('Settings.ControlTab.MinimumValues', { minimum: '1' }),
-                                    (v) =>
-                                        v.length <= 3 ||
-                                        $t('Settings.ControlTab.MaximumValuesVisibility', { maximum: '3' }),
-                                ]"
-                                dense
-                                outlined
-                                hide-spin-buttons></v-combobox>
-                        </settings-row>
-                        <v-divider class="my-2"></v-divider>
-                    </template>
-                    <settings-row
-                        :title="$t('Settings.ControlTab.ZOffsetIncrements').toString()"
-                        :mobile-second-row="true">
+                    <v-divider class="my-2" />
+                    <settings-row :title="$t('Settings.ControlTab.MoveDistancesZInMm')" :mobile-second-row="true">
                         <v-combobox
-                            v-model="offsetsZ"
+                            v-model="stepsCircleZ"
                             hide-selected
                             hide-details="auto"
                             multiple
@@ -227,27 +125,19 @@
                             type="number"
                             :rules="[
                                 (v) => v.length > 0 || $t('Settings.ControlTab.MinimumValues', { minimum: '1' }),
-                                (v) =>
-                                    v.length <= 4 ||
-                                    $t('Settings.ControlTab.MaximumValuesVisibility', { maximum: '4' }),
+                                (v) => v.length <= 4 || $t('Settings.ControlTab.MaximumValues', { maximum: '4' }),
                             ]"
                             dense
                             outlined
                             hide-spin-buttons />
                     </settings-row>
-                    <!-- EXTRUDER CONTROL SETTINGS -->
-                    <div class="d-flex align-center">
-                        <v-icon style="opacity: 0.7">{{ mdiPrinter3dNozzle }}</v-icon>
-                        <v-card-title class="mx-n2">
-                            {{ $t('Panels.ExtruderControlPanel.Headline') }}
-                        </v-card-title>
-                        <v-divider class="ml-3"></v-divider>
-                    </div>
-                    <settings-row
-                        :title="$t('Settings.ControlTab.MoveDistancesEInMm').toString()"
-                        :mobile-second-row="true">
+                    <v-divider class="my-2" />
+                </template>
+                <!-- CONTROL STYLE BARS SPECIFICS -->
+                <template v-else>
+                    <settings-row :title="$t('Settings.ControlTab.MoveDistancesXYInMm')" :mobile-second-row="true">
                         <v-combobox
-                            v-model="feedamountsE"
+                            v-model="stepsXY"
                             hide-selected
                             hide-details="auto"
                             multiple
@@ -258,17 +148,17 @@
                             :rules="[
                                 (v) => v.length > 0 || $t('Settings.ControlTab.MinimumValues', { minimum: '1' }),
                                 (v) =>
-                                    v.length <= 5 ||
-                                    $t('Settings.ControlTab.MaximumValuesVisibility', { maximum: '5' }),
+                                    v.length <= 3 ||
+                                    $t('Settings.ControlTab.MaximumValuesVisibility', { maximum: '3' }),
                             ]"
                             dense
                             outlined
                             hide-spin-buttons></v-combobox>
                     </settings-row>
                     <v-divider class="my-2"></v-divider>
-                    <settings-row :title="$t('Settings.ControlTab.SpeedEInMms').toString()" :mobile-second-row="true">
+                    <settings-row :title="$t('Settings.ControlTab.MoveDistancesZInMm')" :mobile-second-row="true">
                         <v-combobox
-                            v-model="feedratesE"
+                            v-model="stepsZ"
                             hide-selected
                             hide-details="auto"
                             multiple
@@ -279,24 +169,88 @@
                             :rules="[
                                 (v) => v.length > 0 || $t('Settings.ControlTab.MinimumValues', { minimum: '1' }),
                                 (v) =>
-                                    v.length <= 5 ||
-                                    $t('Settings.ControlTab.MaximumValuesVisibility', { maximum: '5' }),
+                                    v.length <= 3 ||
+                                    $t('Settings.ControlTab.MaximumValuesVisibility', { maximum: '3' }),
                             ]"
                             dense
                             outlined
-                            hide-spin-buttons></v-combobox>
-                    </settings-row>
-                    <v-divider class="my-2"></v-divider>
-                    <settings-row
-                        :title="$t('Settings.ControlTab.EstimatedExtrusionInfo').toString()"
-                        :sub-title="$t('Settings.ControlTab.EstimatedExtrusionInfoDescription').toString()"
-                        :dynamic-slot-width="true">
-                        <v-switch v-model="showEstimatedExtrusionInfo" hide-details class="mt-0"></v-switch>
+                            hide-spin-buttons />
                     </settings-row>
-                </v-form>
-            </v-card-text>
-        </v-card>
-    </div>
+                    <v-divider class="my-2" />
+                </template>
+                <settings-row :title="$t('Settings.ControlTab.ZOffsetIncrements')" :mobile-second-row="true">
+                    <v-combobox
+                        v-model="offsetsZ"
+                        hide-selected
+                        hide-details="auto"
+                        multiple
+                        small-chips
+                        :deletable-chips="true"
+                        append-icon=""
+                        type="number"
+                        :rules="[
+                            (v) => v.length > 0 || $t('Settings.ControlTab.MinimumValues', { minimum: '1' }),
+                            (v) => v.length <= 4 || $t('Settings.ControlTab.MaximumValuesVisibility', { maximum: '4' }),
+                        ]"
+                        dense
+                        outlined
+                        hide-spin-buttons />
+                </settings-row>
+                <!-- EXTRUDER CONTROL SETTINGS -->
+                <div class="d-flex align-center">
+                    <v-icon style="opacity: 0.7">{{ mdiPrinter3dNozzle }}</v-icon>
+                    <v-card-title class="mx-n2">
+                        {{ $t('Panels.ExtruderControlPanel.Headline') }}
+                    </v-card-title>
+                    <v-divider class="ml-3" />
+                </div>
+                <settings-row :title="$t('Settings.ControlTab.MoveDistancesEInMm')" :mobile-second-row="true">
+                    <v-combobox
+                        v-model="feedamountsE"
+                        hide-selected
+                        hide-details="auto"
+                        multiple
+                        small-chips
+                        :deletable-chips="true"
+                        append-icon=""
+                        type="number"
+                        :rules="[
+                            (v) => v.length > 0 || $t('Settings.ControlTab.MinimumValues', { minimum: '1' }),
+                            (v) => v.length <= 5 || $t('Settings.ControlTab.MaximumValuesVisibility', { maximum: '5' }),
+                        ]"
+                        dense
+                        outlined
+                        hide-spin-buttons />
+                </settings-row>
+                <v-divider class="my-2" />
+                <settings-row :title="$t('Settings.ControlTab.SpeedEInMms')" :mobile-second-row="true">
+                    <v-combobox
+                        v-model="feedratesE"
+                        hide-selected
+                        hide-details="auto"
+                        multiple
+                        small-chips
+                        :deletable-chips="true"
+                        append-icon=""
+                        type="number"
+                        :rules="[
+                            (v) => v.length > 0 || $t('Settings.ControlTab.MinimumValues', { minimum: '1' }),
+                            (v) => v.length <= 5 || $t('Settings.ControlTab.MaximumValuesVisibility', { maximum: '5' }),
+                        ]"
+                        dense
+                        outlined
+                        hide-spin-buttons />
+                </settings-row>
+                <v-divider class="my-2" />
+                <settings-row
+                    :title="$t('Settings.ControlTab.EstimatedExtrusionInfo')"
+                    :sub-title="$t('Settings.ControlTab.EstimatedExtrusionInfoDescription')"
+                    :dynamic-slot-width="true">
+                    <v-switch v-model="showEstimatedExtrusionInfo" hide-details class="mt-0" />
+                </settings-row>
+            </v-form>
+        </v-card-text>
+    </v-card>
 </template>
 
 <script lang="ts">

From 3c6691fae8796849871b9b1a22d079e492df51b2 Mon Sep 17 00:00:00 2001
From: Stefan Dej <meteyou@gmail.com>
Date: Sun, 29 Oct 2023 17:36:22 +0100
Subject: [PATCH 2/4] refactor: refactor SettingsControlTab

Signed-off-by: Stefan Dej <meteyou@gmail.com>
---
 src/components/settings/SettingsControlTab.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/settings/SettingsControlTab.vue b/src/components/settings/SettingsControlTab.vue
index b86e16d43..d50940db3 100644
--- a/src/components/settings/SettingsControlTab.vue
+++ b/src/components/settings/SettingsControlTab.vue
@@ -40,7 +40,7 @@
                     <settings-row :title="$t('Settings.ControlTab.InvertZMovement')" :dynamic-slot-width="true">
                         <v-switch v-model="reverseZ" hide-details class="mt-0" />
                     </settings-row>
-                    <v-divider class="my-2"></v-divider>
+                    <v-divider class="my-2" />
                 </template>
                 <settings-row :title="$t('Settings.ControlTab.SpeedXY')">
                     <v-text-field
@@ -153,9 +153,9 @@
                             ]"
                             dense
                             outlined
-                            hide-spin-buttons></v-combobox>
+                            hide-spin-buttons />
                     </settings-row>
-                    <v-divider class="my-2"></v-divider>
+                    <v-divider class="my-2" />
                     <settings-row :title="$t('Settings.ControlTab.MoveDistancesZInMm')" :mobile-second-row="true">
                         <v-combobox
                             v-model="stepsZ"

From 6b751cc438bf5a911e22b18e6aede5a70dc87dbe Mon Sep 17 00:00:00 2001
From: Stefan Dej <meteyou@gmail.com>
Date: Sun, 29 Oct 2023 18:50:42 +0100
Subject: [PATCH 3/4] feat: add option to change the the save z-offset method

Signed-off-by: Stefan Dej <meteyou@gmail.com>
---
 src/components/mixins/zoffset.ts              | 69 +++++++++++++++++++
 .../ToolheadControls/ZoffsetControl.vue       | 63 +----------------
 .../settings/SettingsControlTab.vue           | 52 +++++++++++++-
 src/locales/en.json                           |  2 +
 src/store/gui/index.ts                        |  1 +
 src/store/gui/types.ts                        |  1 +
 6 files changed, 126 insertions(+), 62 deletions(-)
 create mode 100644 src/components/mixins/zoffset.ts

diff --git a/src/components/mixins/zoffset.ts b/src/components/mixins/zoffset.ts
new file mode 100644
index 000000000..c4f8b63de
--- /dev/null
+++ b/src/components/mixins/zoffset.ts
@@ -0,0 +1,69 @@
+import Vue from 'vue'
+import Component from 'vue-class-component'
+import { CommandHelp } from '@/store/printer/types'
+
+@Component
+export default class ZoffsetMixin extends Vue {
+    get homing_origin() {
+        return this.$store.state.printer?.gcode_move?.homing_origin ?? []
+    }
+
+    get z_gcode_offset() {
+        return this.homing_origin.length > 1 ? Math.round(this.homing_origin[2] * 1000) / 1000 : 0
+    }
+    get helplist() {
+        return this.$store.state.printer.helplist ?? []
+    }
+
+    get settings() {
+        return this.$store.state.printer.configfile?.settings ?? {}
+    }
+
+    get kinematics() {
+        return this.settings.printer?.kinematics ?? 'cartesian'
+    }
+
+    get stepper_name() {
+        if (this.kinematics === 'delta') return 'stepper_a'
+
+        return 'stepper_z'
+    }
+
+    get endstop_pin() {
+        const stepperConfig = this.settings[this.stepper_name] ?? {}
+
+        return stepperConfig?.endstop_pin
+    }
+
+    get zOffset(): number {
+        return this.$store.state.printer?.gcode_move?.homing_origin[2].toFixed(3)
+    }
+    get isEndstopProbe() {
+        return this.endstop_pin.search('probe:z_virtual_endstop') !== -1
+    }
+
+    get existZOffsetApplyProbe() {
+        return this.helplist.findIndex((gcode: CommandHelp) => gcode.commandLow === 'z_offset_apply_probe') !== -1
+    }
+
+    get existZOffsetApplyEndstop() {
+        return this.helplist.findIndex((gcode: CommandHelp) => gcode.commandLow === 'z_offset_apply_endstop') !== -1
+    }
+
+    get showSaveButton() {
+        // hide button when offset is 0
+        if (this.z_gcode_offset === 0) return false
+
+        // show button when z endstop is probe and probe gcode exists
+        if (this.isEndstopProbe && this.existZOffsetApplyProbe) return true
+
+        // show button when z endstop is endstop and endstop gcode exists
+        return !this.isEndstopProbe && this.existZOffsetApplyEndstop
+    }
+
+    get autoSaveZOffsetOption() {
+        if (this.isEndstopProbe && this.existZOffsetApplyProbe) return 'Z_OFFSET_APPLY_PROBE'
+
+        return 'Z_OFFSET_APPLY_ENDSTOP'
+    }
+}
diff --git a/src/components/panels/ToolheadControls/ZoffsetControl.vue b/src/components/panels/ToolheadControls/ZoffsetControl.vue
index 65d447b73..23df57df5 100644
--- a/src/components/panels/ToolheadControls/ZoffsetControl.vue
+++ b/src/components/panels/ToolheadControls/ZoffsetControl.vue
@@ -124,7 +124,6 @@
 
 <script lang="ts">
 import { Component, Mixins } from 'vue-property-decorator'
-import { CommandHelp } from '@/store/printer/types'
 import BaseMixin from '@/components/mixins/base'
 import Panel from '@/components/ui/Panel.vue'
 import Responsive from '@/components/ui/Responsive.vue'
@@ -137,10 +136,11 @@ import {
     mdiArrowExpandUp,
     mdiLayersOutline,
 } from '@mdi/js'
+import ZoffsetMixin from '@/components/mixins/zoffset'
 @Component({
     components: { Panel, Responsive },
 })
-export default class ZoffsetControl extends Mixins(BaseMixin) {
+export default class ZoffsetControl extends Mixins(BaseMixin, ZoffsetMixin) {
     mdiBroom = mdiBroom
     mdiContentSave = mdiContentSave
     mdiArrowCollapseDown = mdiArrowCollapseDown
@@ -150,14 +150,6 @@ export default class ZoffsetControl extends Mixins(BaseMixin) {
 
     saveOffsetDialog = false
 
-    get homing_origin() {
-        return this.$store.state.printer?.gcode_move?.homing_origin ?? []
-    }
-
-    get z_gcode_offset() {
-        return this.homing_origin.length > 1 ? Math.round(this.homing_origin[2] * 1000) / 1000 : 0
-    }
-
     get offsetsZ() {
         return this.$store.state.gui.control.offsetsZ
     }
@@ -166,57 +158,6 @@ export default class ZoffsetControl extends Mixins(BaseMixin) {
         return this.$store.state.printer.toolhead?.homed_axes ?? ''
     }
 
-    get helplist() {
-        return this.$store.state.printer.helplist ?? []
-    }
-
-    get settings() {
-        return this.$store.state.printer.configfile?.settings ?? {}
-    }
-
-    get kinematics() {
-        return this.settings.printer?.kinematics ?? 'cartesian'
-    }
-
-    get stepper_name() {
-        if (this.kinematics === 'delta') return 'stepper_a'
-
-        return 'stepper_z'
-    }
-
-    get endstop_pin() {
-        const stepperConfig = this.settings[this.stepper_name] ?? {}
-
-        return stepperConfig?.endstop_pin
-    }
-
-    get isEndstopProbe() {
-        return this.endstop_pin.search('probe:z_virtual_endstop') !== -1
-    }
-
-    get existZOffsetApplyProbe() {
-        return this.helplist.findIndex((gcode: CommandHelp) => gcode.commandLow === 'z_offset_apply_probe') !== -1
-    }
-
-    get existZOffsetApplyEndstop() {
-        return this.helplist.findIndex((gcode: CommandHelp) => gcode.commandLow === 'z_offset_apply_endstop') !== -1
-    }
-
-    get zOffset(): number {
-        return this.$store.state.printer?.gcode_move?.homing_origin[2].toFixed(3)
-    }
-
-    get showSaveButton() {
-        // hide button when offset is 0
-        if (this.z_gcode_offset === 0) return false
-
-        // show button when z endstop is probe and probe gcode exists
-        if (this.isEndstopProbe && this.existZOffsetApplyProbe) return true
-
-        // show button when z endstop is endstop and endstop gcode exists
-        return !this.isEndstopProbe && this.existZOffsetApplyEndstop
-    }
-
     sendBabyStepDown(offset: number): void {
         const gcode = `SET_GCODE_OFFSET Z_ADJUST=-${offset} ${this.homed_axis === 'xyz' ? 'MOVE=1' : ''}`
         this.$store.dispatch('server/addEvent', { message: gcode, type: 'command' })
diff --git a/src/components/settings/SettingsControlTab.vue b/src/components/settings/SettingsControlTab.vue
index d50940db3..8fbe7eb92 100644
--- a/src/components/settings/SettingsControlTab.vue
+++ b/src/components/settings/SettingsControlTab.vue
@@ -178,6 +178,20 @@
                     </settings-row>
                     <v-divider class="my-2" />
                 </template>
+                <template>
+                    <settings-row
+                        :title="$t('Settings.ControlTab.ZOffsetSaveOption')"
+                        :sub-title="$t('Settings.ControlTab.ZOffsetSaveOptionDescription')">
+                        <v-select
+                            v-model="offsetZSaveOption"
+                            :items="offsetZSaveOptions"
+                            class="mt-0"
+                            hide-details
+                            outlined
+                            dense />
+                    </settings-row>
+                    <v-divider class="my-2" />
+                </template>
                 <settings-row :title="$t('Settings.ControlTab.ZOffsetIncrements')" :mobile-second-row="true">
                     <v-combobox
                         v-model="offsetsZ"
@@ -259,11 +273,12 @@ import BaseMixin from '@/components/mixins/base'
 import ControlMixin from '@/components/mixins/control'
 import SettingsRow from '@/components/settings/SettingsRow.vue'
 import { mdiPrinter3dNozzle, mdiGamepad } from '@mdi/js'
+import ZoffsetMixin from '@/components/mixins/zoffset'
 
 @Component({
     components: { SettingsRow },
 })
-export default class SettingsControlTab extends Mixins(BaseMixin, ControlMixin) {
+export default class SettingsControlTab extends Mixins(BaseMixin, ControlMixin, ZoffsetMixin) {
     mdiGamepad = mdiGamepad
     mdiPrinter3dNozzle = mdiPrinter3dNozzle
 
@@ -519,6 +534,41 @@ export default class SettingsControlTab extends Mixins(BaseMixin, ControlMixin)
         this.$store.dispatch('gui/saveSetting', { name: 'control.extruder.showEstimatedExtrusionInfo', value: newVal })
     }
 
+    get offsetZSaveOption() {
+        return this.$store.state.gui.control.offsetZSaveOption ?? null
+    }
+
+    set offsetZSaveOption(newVal) {
+        this.$store.dispatch('gui/saveSetting', { name: 'control.offsetZSaveOption', value: newVal })
+    }
+
+    get offsetZSaveOptions() {
+        const defaultValue = this.autoSaveZOffsetOption.replace(/Z_OFFSET_APPLY_/g, '')
+
+        const output: { value: string | null; text: string }[] = [
+            {
+                value: null,
+                text: `Auto (${defaultValue})`,
+            },
+        ]
+
+        if (this.existZOffsetApplyEndstop) {
+            output.push({
+                value: 'Z_OFFSET_APPLY_ENDSTOP',
+                text: 'ENDSTOP',
+            })
+        }
+
+        if (this.existZOffsetApplyProbe) {
+            output.push({
+                value: 'Z_OFFSET_APPLY_PROBE',
+                text: 'PROBE',
+            })
+        }
+
+        return output
+    }
+
     blurFeedrateXY() {
         if (!(this.feedrateXY > 0)) this.feedrateXY = 100
     }
diff --git a/src/locales/en.json b/src/locales/en.json
index d37a31640..a7f2ef17e 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -853,6 +853,8 @@
             "Style": "Style",
             "ValueGreaterThan": "Value has to be greater than {value}",
             "ZOffsetIncrements": "Z-Offset increments (in mm)",
+            "ZOffsetSaveOption": "Z-Offset save option",
+            "ZOffsetSaveOptionDescription": "Change the option to save the Z-Offset",
             "ZTiltAdjust": "Z-Tilt Adjust{isDefault}"
         },
         "DashboardTab": {
diff --git a/src/store/gui/index.ts b/src/store/gui/index.ts
index 47512562c..75423f3aa 100644
--- a/src/store/gui/index.ts
+++ b/src/store/gui/index.ts
@@ -36,6 +36,7 @@ export const getDefaultState = (): GuiState => {
             stepsXY: [100, 10, 1],
             feedrateZ: 25,
             offsetsZ: [0.005, 0.01, 0.025, 0.05],
+            offsetZSaveOption: null,
             stepsZ: [25, 1, 0.1],
             stepsAll: [0.1, 1, 10, 25, 50, 100],
             stepsCircleXY: [1, 10, 50, 100],
diff --git a/src/store/gui/types.ts b/src/store/gui/types.ts
index 7ad7e9124..90e9a7a56 100644
--- a/src/store/gui/types.ts
+++ b/src/store/gui/types.ts
@@ -27,6 +27,7 @@ export interface GuiState {
         stepsXY: number[]
         feedrateZ: number
         offsetsZ: number[]
+        offsetZSaveOption: null | 'Z_OFFSET_APPLY_ENDSTOP' | 'Z_OFFSET_APPLY_PROBE'
         stepsZ: number[]
         stepsAll: number[]
         stepsCircleXY: number[]

From 7210346c8cc70487206f1b9f0076793aeff5d8aa Mon Sep 17 00:00:00 2001
From: Stefan Dej <meteyou@gmail.com>
Date: Sun, 29 Oct 2023 18:58:02 +0100
Subject: [PATCH 4/4] feat: use stored option in z-offset section in the
 toolhead panel

Signed-off-by: Stefan Dej <meteyou@gmail.com>
---
 .../ToolheadControls/ZoffsetControl.vue       | 22 +++++--------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/src/components/panels/ToolheadControls/ZoffsetControl.vue b/src/components/panels/ToolheadControls/ZoffsetControl.vue
index 23df57df5..ad8794731 100644
--- a/src/components/panels/ToolheadControls/ZoffsetControl.vue
+++ b/src/components/panels/ToolheadControls/ZoffsetControl.vue
@@ -158,6 +158,10 @@ export default class ZoffsetControl extends Mixins(BaseMixin, ZoffsetMixin) {
         return this.$store.state.printer.toolhead?.homed_axes ?? ''
     }
 
+    get offsetZSaveOption() {
+        return this.$store.state.gui.control.offsetZSaveOption ?? null
+    }
+
     sendBabyStepDown(offset: number): void {
         const gcode = `SET_GCODE_OFFSET Z_ADJUST=-${offset} ${this.homed_axis === 'xyz' ? 'MOVE=1' : ''}`
         this.$store.dispatch('server/addEvent', { message: gcode, type: 'command' })
@@ -177,23 +181,9 @@ export default class ZoffsetControl extends Mixins(BaseMixin, ZoffsetMixin) {
     }
 
     saveZOffset(): void {
-        if (this.isEndstopProbe && this.existZOffsetApplyProbe) {
-            this.saveZOffsetToProbe()
-            return
-        }
-
-        this.saveZOffsetToEndstop()
-    }
-
-    saveZOffsetToEndstop(): void {
-        const gcode = 'Z_OFFSET_APPLY_ENDSTOP'
-        this.$store.dispatch('server/addEvent', { message: gcode, type: 'command' })
-        this.$socket.emit('printer.gcode.script', { script: gcode })
-        this.saveOffsetDialog = true
-    }
+        let gcode = this.offsetZSaveOption
+        if (gcode === null) gcode = this.autoSaveZOffsetOption
 
-    saveZOffsetToProbe(): void {
-        const gcode = 'Z_OFFSET_APPLY_PROBE'
         this.$store.dispatch('server/addEvent', { message: gcode, type: 'command' })
         this.$socket.emit('printer.gcode.script', { script: gcode })
         this.saveOffsetDialog = true