macro and group settings extended

HelgeKeck · Aug 5, 2024 · c637256 · c637256
1 parent 9c7aa55
commit c637256
Show file tree

Hide file tree

Showing 7 changed files with 138 additions and 9 deletions.
diff --git a/src/components/settings/macros/MacroCategoryDialog.vue b/src/components/settings/macros/MacroCategoryDialog.vue
@@ -2,7 +2,7 @@
   <app-dialog
     v-model="open"
     :title="title"
-    max-width="350"
+    max-width="480"
     @save="handleSave"
   >
     <v-card-text class="pa-0">
@@ -51,6 +51,45 @@
           hide-details
         />
       </app-setting>
+
+      <v-divider />
+
+      <app-setting
+        :title="$t('app.general.label.hide_while_printing')"
+      >
+        <v-switch
+          v-model="newHideWhilePrinting"
+          class="mt-0 pt-0"
+          color="primary"
+          hide-details
+        />
+      </app-setting>
+
+      <v-divider />
+
+      <app-setting
+        :title="$t('app.general.label.hide_while_paused')"
+      >
+        <v-switch
+          v-model="newHideWhilePaused"
+          class="mt-0 pt-0"
+          color="primary"
+          hide-details
+        />
+      </app-setting>
+
+      <v-divider />
+
+      <app-setting
+        :title="$t('app.general.label.hide_while_standby')"
+      >
+        <v-switch
+          v-model="newHideWhileStandby"
+          class="mt-0 pt-0"
+          color="primary"
+          hide-details
+        />
+      </app-setting>
     </v-card-text>
   </app-dialog>
 </template>
@@ -79,25 +118,40 @@ export default class MacroCategoryDialog extends Vue {
   @Prop({ type: Boolean, required: true })
   readonly visible!: boolean
 
+  @Prop({ type: Boolean, required: true })
+  readonly hideWhilePrinting!: boolean
+
+  @Prop({ type: Boolean, required: true })
+  readonly hideWhilePaused!: boolean
+
+  @Prop({ type: Boolean, required: true })
+  readonly hideWhileStandby!: boolean
+
   @Prop({ type: Array<InputValidationRules> })
   readonly rules?: InputValidationRules[]
 
   newName = ''
   newColor = ''
   newVisible = true
+  newHideWhilePrinting = true
+  newHideWhilePaused = true
+  newHideWhileStandby = true
 
   mounted () {
     this.newName = this.name
     this.newColor = this.color
     this.newVisible = this.visible
+    this.newHideWhilePrinting = this.hideWhilePrinting
+    this.newHideWhilePaused = this.hideWhilePaused
+    this.newHideWhileStandby = this.hideWhileStandby
   }
 
   get categories () {
     return this.$store.getters['macros/getCategories']
   }
 
   handleSave () {
-    this.$emit('save', this.newName, this.newColor, this.newVisible)
+    this.$emit('save', this.newName, this.newColor, this.newVisible, this.newHideWhilePrinting, this.newHideWhilePaused, this.newHideWhileStandby)
     this.open = false
   }
 

diff --git a/src/components/settings/macros/MacroSettings.vue b/src/components/settings/macros/MacroSettings.vue
@@ -120,6 +120,9 @@
         :name="categoryDialogState.name"
         :color="categoryDialogState.color"
         :visible="categoryDialogState.visible"
+        :hide-while-printing="categoryDialogState.hideWhilePrinting"
+        :hide-while-paused="categoryDialogState.hideWhilePaused"
+        :hide-while-standby="categoryDialogState.hideWhileStandby"
         :rules="categoryDialogState.rules"
         @save="categoryDialogState.handler"
       />
@@ -147,6 +150,9 @@ export default class MacroSettings extends Mixins(StateMixin) {
     name: '',
     color: '',
     visible: true,
+    hideWhilePrinting: false,
+    hideWhilePaused: false,
+    hideWhileStandby: false,
     rules: [],
     handler: this.handleAddCategory
   }
@@ -178,6 +184,9 @@ export default class MacroSettings extends Mixins(StateMixin) {
       name: '',
       color: '',
       visible: true,
+      hideWhilePrinting: false,
+      hideWhilePaused: false,
+      hideWhileStandby: false,
       rules: [
         this.$rules.required,
         this.customRules.uniqueName
@@ -195,6 +204,9 @@ export default class MacroSettings extends Mixins(StateMixin) {
       name: category.name,
       color: category.color ?? '',
       visible: category.visible,
+      hideWhilePrinting: category.hideWhilePrinting,
+      hideWhilePaused: category.hideWhilePaused,
+      hideWhileStandby: category.hideWhileStandby,
       rules: [
         this.$rules.required
       ],
@@ -210,12 +222,15 @@ export default class MacroSettings extends Mixins(StateMixin) {
     this.$store.dispatch('macros/addCategory', category)
   }
 
-  handleEditCategory (name: string, color: string, visible: boolean) {
+  handleEditCategory (name: string, color: string, visible: boolean, hideWhilePrinting: boolean, hideWhilePaused: boolean, hideWhileStandby: boolean) {
     const category = {
       ...this.categoryDialogState.category,
       name,
       color,
-      visible
+      visible,
+      hideWhilePrinting,
+      hideWhilePaused,
+      hideWhileStandby
     }
     this.$store.dispatch('macros/editCategory', category)
   }

diff --git a/src/components/settings/macros/MacroSettingsDialog.vue b/src/components/settings/macros/MacroSettingsDialog.vue
@@ -72,6 +72,19 @@
 
         <v-divider /> -->
 
+      <app-setting
+        :title="$t('app.general.label.visible')"
+      >
+        <v-switch
+          v-model="newMacro.visible"
+          class="mt-0 pt-0"
+          color="primary"
+          hide-details
+        />
+      </app-setting>
+
+      <v-divider />
+
       <app-setting
         :title="$t('app.general.label.disabled_while_printing')"
       >
@@ -86,10 +99,36 @@
       <v-divider />
 
       <app-setting
-        :title="$t('app.general.label.visible')"
+        :title="$t('app.general.label.hide_while_printing')"
       >
         <v-switch
-          v-model="newMacro.visible"
+          v-model="newMacro.hideWhilePrinting"
+          class="mt-0 pt-0"
+          color="primary"
+          hide-details
+        />
+      </app-setting>
+
+      <v-divider />
+
+      <app-setting
+        :title="$t('app.general.label.hide_while_paused')"
+      >
+        <v-switch
+          v-model="newMacro.hideWhilePaused"
+          class="mt-0 pt-0"
+          color="primary"
+          hide-details
+        />
+      </app-setting>
+
+      <v-divider />
+
+      <app-setting
+        :title="$t('app.general.label.hide_while_standby')"
+      >
+        <v-switch
+          v-model="newMacro.hideWhileStandby"
           class="mt-0 pt-0"
           color="primary"
           hide-details

diff --git a/src/locales/en.yaml b/src/locales/en.yaml
@@ -260,6 +260,9 @@ app:
       current_user: Current user
       default: Default
       disabled_while_printing: Disabled while printing
+      hide_while_printing: Hide while printing
+      hide_while_paused: Hide when paused
+      hide_while_standby: Hide in standby
       edit_camera: Edit Camera
       edit_filter: Edit Filter
       edit_preset: Edit Preset

diff --git a/src/store/macros/getters.ts b/src/store/macros/getters.ts
@@ -6,6 +6,9 @@ export const MACRO_DEFAULTS = {
   alias: '',
   visible: true,
   disabledWhilePrinting: false,
+  hideWhilePrinting: false,
+  hideWhilePaused: false,
+  hideWhileStandby: false,
   color: '',
   categoryId: '0',
   order: undefined
@@ -121,7 +124,7 @@ export const getters: GetterTree<MacrosState, RootState> = {
   getCategories: (state, getters) => {
     const cateories = state.categories
       .map(category => {
-        const { id, name, color, order, visible } = category
+        const { id, name, color, order, visible, hideWhilePrinting, hideWhilePaused, hideWhileStandby } = category
 
         const macros = getters.getMacrosByCategory(id) as Macro[]
         const count = macros.length
@@ -133,6 +136,9 @@ export const getters: GetterTree<MacrosState, RootState> = {
           id,
           name,
           visible,
+          hideWhilePrinting,
+          hideWhilePaused,
+          hideWhileStandby,
           count,
           color,
           order

diff --git a/src/store/macros/mutations.ts b/src/store/macros/mutations.ts
@@ -69,7 +69,10 @@ export const mutations: MutationTree<MacrosState> = {
       name: payload.name,
       order: payload.order,
       color: payload.color,
-      visible: payload.visible
+      visible: payload.visible,
+      hideWhilePrinting: payload.hideWhilePrinting,
+      hideWhilePaused: payload.hideWhilePaused,
+      hideWhileStandby: payload.hideWhileStandby
     })
     state.stored.forEach((macro, i) => {
       if (macro.categoryId === payload.id) {
@@ -98,7 +101,10 @@ export const mutations: MutationTree<MacrosState> = {
       id: payload.id,
       name: payload.name,
       order: payload.order,
-      visible: payload.visible
+      visible: payload.visible,
+      hideWhilePrinting: payload.hideWhilePrinting,
+      hideWhilePaused: payload.hideWhilePaused,
+      hideWhileStandby: payload.hideWhileStandby
     })
     state.stored.forEach((macro, i) => {
       if (macro.categoryId === payload.id) {

diff --git a/src/store/macros/types.ts b/src/store/macros/types.ts
@@ -12,6 +12,9 @@ export interface Macro {
   category?: MacroCategory;
   assignTo?: string;
   disabledWhilePrinting?: boolean;
+  hideWhilePrinting?: boolean;
+  hideWhilePaused?: boolean;
+  hideWhileStandby?: boolean;
   color?: string;
   config?: any;
   order?: number;
@@ -25,4 +28,7 @@ export interface MacroCategory {
   visible?: number;
   order?: number;
   color?: string;
+  hideWhilePrinting?: boolean;
+  hideWhilePaused?: boolean;
+  hideWhileStandby?: boolean;
 }