fix: buttons no longer flicker during file actions

Signed-off-by: Craig Bassett <[email protected]>
fluidd-core · Apr 12, 2021 · 5e395ad · 5e395ad
1 parent add9272
commit 5e395ad
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 31 deletions.
diff --git a/src/components/ui/AppBtnToolheadMove.vue b/src/components/ui/AppBtnToolheadMove.vue
@@ -35,7 +35,7 @@ export default class AppBtnToolheadMove extends Vue {
   @Prop()
   disabled!: boolean
 
-  @Prop({ type: String, default: 'secondary' })
+  @Prop({ type: String, default: 'btncolor' })
   color!: string
 
   @Prop({ type: Boolean, default: false })

diff --git a/src/components/widgets/bedmesh/BedMeshControls.vue b/src/components/widgets/bedmesh/BedMeshControls.vue
@@ -29,13 +29,13 @@
           <td class="grey--text focus--text"><span v-if="item.active && mesh.variance">{{ mesh.variance.toFixed(4) }}</span></td>
           <td class="text-right">
             <v-tooltip
-              v-if="!item.active && !hasWaits && !printerPrinting && !printerBusy"
+              v-if="!item.active && !printerPrinting && !printerBusy"
               bottom
             >
               <template v-slot:activator="{ on, attrs }">
                 <app-btn
                   @click="loadProfile(item.profile_name)"
-                  v-if="!item.active && !hasWaits && !printerPrinting && !printerBusy"
+                  v-if="!item.active && !printerPrinting && !printerBusy"
                   v-bind="attrs"
                   v-on="on"
                   x-small
@@ -53,7 +53,7 @@
               <template v-slot:activator="{ on, attrs }">
                 <app-btn
                   @click="removeProfile(item.profile_name)"
-                  :disabled="hasWaits || printerPrinting || printerBusy"
+                  :disabled="printerPrinting || printerBusy"
                   v-bind="attrs"
                   v-on="on"
                   color=""
@@ -96,7 +96,7 @@
                 block
                 class="mb-2"
                 :loading="hasWait(waits.onMeshCalibrate)"
-                :disabled="hasWaits || printerPrinting || printerBusy"
+                :disabled="printerPrinting || printerBusy"
                 @click="calibrate()">
                 {{ $t('app.general.btn.calibrate') }}
               </app-btn>
@@ -112,7 +112,7 @@
                 block
                 small
                 color="primary"
-                :disabled="!meshLoaded || hasWaits || printerPrinting || printerBusy"
+                :disabled="!meshLoaded || printerPrinting || printerBusy"
                 @click="handleOpenSaveDialog()">
                 {{ $t('app.general.btn.save_as') }}
               </app-btn>
@@ -128,7 +128,7 @@
             small
             class="mb-2"
             :loading="hasWait(waits.onHomeAll)"
-            :disabled="hasWaits || printerPrinting || printerBusy"
+            :disabled="printerPrinting || printerBusy"
             :color="(!allHomed) ? 'primary' : undefined">
               <v-icon small class="mr-1">$home</v-icon> {{ $t('app.general.btn.all') }}
           </app-btn>
@@ -138,7 +138,7 @@
             @click="sendGcode('QUAD_GANTRY_LEVEL', waits.onQGL)"
             :elevation="2"
             :loading="hasWait(waits.onQGL)"
-            :disabled="hasWaits || printerPrinting || printerBusy"
+            :disabled="printerPrinting || printerBusy"
             block
             class="mb-2"
             small>
@@ -151,7 +151,7 @@
       <v-row>
         <v-col>
           <v-radio-group
-            :disabled="!meshLoaded || hasWaits || printerPrinting || printerBusy"
+            :disabled="!meshLoaded || printerPrinting || printerBusy"
             v-model="matrix"
             column
             hide-details
@@ -171,7 +171,7 @@
         </v-col>
         <v-col>
           <v-checkbox
-            :disabled="!meshLoaded || hasWaits || printerPrinting || printerBusy"
+            :disabled="!meshLoaded || printerPrinting || printerBusy"
             :label="$t('app.bedmesh.label.wireframe')"
             v-model="wireframe"
             hide-details
@@ -180,7 +180,7 @@
           </v-checkbox>
 
           <v-checkbox
-            :disabled="!meshLoaded || hasWaits || printerPrinting || printerBusy"
+            :disabled="!meshLoaded || printerPrinting || printerBusy"
             :label="$t('app.bedmesh.label.scale')"
             v-model="scale"
             hide-details
@@ -189,7 +189,7 @@
           </v-checkbox>
 
           <v-checkbox
-            :disabled="!meshLoaded || hasWaits || printerPrinting || printerBusy"
+            :disabled="!meshLoaded || printerPrinting || printerBusy"
             :label="$t('app.bedmesh.label.flat_surface')"
             v-model="flatSurface"
             hide-details

diff --git a/src/components/widgets/toolhead/ExtruderMoves.vue b/src/components/widgets/toolhead/ExtruderMoves.vue
@@ -18,7 +18,7 @@
       <v-col cols="6">
         <app-btn
           @click="sendRetractGcode(extrudeLength, extrudeSpeed, waits.onExtract)"
-          :disabled="hasWaits || !extrudeRetractReady || !klippyReady || !valid"
+          :disabled="!extrudeRetractReady || !klippyReady || !valid"
           :elevation="2"
           block
           class="mr-2">
@@ -44,7 +44,7 @@
       <v-col cols="6">
         <app-btn
           @click="sendExtrudeGcode(extrudeLength, extrudeSpeed, waits.onExtrude)"
-          :disabled="hasWaits || !extrudeRetractReady || !klippyReady || !valid"
+          :disabled="!extrudeRetractReady || !klippyReady || !valid"
           :elevation="2"
           block
           class="mr-2">

diff --git a/src/components/widgets/toolhead/ToolheadCard.vue b/src/components/widgets/toolhead/ToolheadCard.vue
@@ -29,7 +29,7 @@
       <app-btn
         @click="sendGcode('M84')"
         :elevation="2"
-        :disabled="hasWaits || !klippyReady || printerPrinting"
+        :disabled="!klippyReady || printerPrinting"
         small
         class="ma-1">
           MOTORS OFF
@@ -39,7 +39,7 @@
         @click="sendGcode('BED_SCREWS_ADJUST', waits.onBedScrewsAdjust)"
         :elevation="2"
         :loading="hasWait(waits.onBedScrewsAdjust)"
-        :disabled="hasWaits || !klippyReady || printerPrinting"
+        :disabled="!klippyReady || printerPrinting"
         small
         class="ma-1">
           Bed_Screws_Adjust
@@ -49,7 +49,7 @@
         @click="sendGcode('SCREWS_TILT_CALCULATE', waits.onBedScrewsCalculate)"
         :elevation="2"
         :loading="hasWait(waits.onBedScrewsCalculate)"
-        :disabled="!allHomed || hasWaits || !klippyReady || printerPrinting"
+        :disabled="!allHomed || !klippyReady || printerPrinting"
         small
         class="ma-1">
           Screws_Tilt_Calculate
@@ -59,7 +59,7 @@
         @click="sendGcode('Z_TILT_ADJUST', waits.onZTilt)"
         :elevation="2"
         :loading="hasWait(waits.onZTilt)"
-        :disabled="hasWaits || !klippyReady || printerPrinting"
+        :disabled="!klippyReady || printerPrinting"
         small
         class="ma-1">
           Z_Tilt_Adjust
@@ -69,7 +69,7 @@
         @click="sendGcode('QUAD_GANTRY_LEVEL', waits.onQGL)"
         :elevation="2"
         :loading="hasWait(waits.onQGL)"
-        :disabled="hasWaits || !klippyReady || printerPrinting"
+        :disabled="!klippyReady || printerPrinting"
         small
         class="ma-1">
           QGL

diff --git a/src/components/widgets/toolhead/ToolheadMoves.vue b/src/components/widgets/toolhead/ToolheadMoves.vue
@@ -4,22 +4,22 @@
       <v-col cols="auto" class="ml-12 mr-12">
         <app-btn-toolhead-move
           @click="sendMoveGcode('Y', toolheadMoveLength)"
-          :disabled="hasWaits || !xyHomed || !klippyReady"
+          :disabled="!xyHomed || !klippyReady"
           icon="$up">
         </app-btn-toolhead-move>
       </v-col>
       <v-col cols="auto" class="ml-2">
         <app-btn-toolhead-move
           @click="sendMoveGcode('Z', toolheadMoveLength)"
-          :disabled="hasWaits || !zHomed || !klippyReady"
+          :disabled="!zHomed || !klippyReady"
           icon="$up">
         </app-btn-toolhead-move>
       </v-col>
       <v-col class="ml-2" v-if="canHomeXY">
         <app-btn-toolhead-move
           :color="(!allHomed) ? 'primary' : undefined"
           :loading="hasWait(waits.onHomeAll)"
-          :disabled="!klippyReady || printerPrinting || hasWaits"
+          :disabled="!klippyReady || printerPrinting"
           @click="sendGcode('G28', waits.onHomeAll)"
           icon="$home"
           small-icon>
@@ -31,15 +31,15 @@
       <v-col cols="auto">
         <app-btn-toolhead-move
           @click="sendMoveGcode('X', toolheadMoveLength, true)"
-          :disabled="hasWaits || !xyHomed || !klippyReady"
+          :disabled="!xyHomed || !klippyReady"
           icon="$left">
         </app-btn-toolhead-move>
       </v-col>
       <v-col cols="auto" class="ml-2">
         <app-btn-toolhead-move
           :color="(!xyHomed) ? 'primary' : undefined"
           :loading="hasWait(waits.onHomeXY)"
-          :disabled="!klippyReady || printerPrinting || hasWaits"
+          :disabled="!klippyReady || printerPrinting"
           @click="sendGcode('G28 X Y', waits.onHomeXY)"
           :tooltip="$t('app.tool.tooltip.home_xy')"
           icon="$home">
@@ -48,15 +48,15 @@
       <v-col cols="auto" class="ml-2">
         <app-btn-toolhead-move
           @click="sendMoveGcode('X', toolheadMoveLength)"
-          :disabled="hasWaits || !xyHomed || !klippyReady"
+          :disabled="!xyHomed || !klippyReady"
           icon="$right">
         </app-btn-toolhead-move>
       </v-col>
       <v-col cols="auto" class="ml-2" v-if="canHomeXY">
         <app-btn-toolhead-move
           :color="(!zHomed) ? 'primary' : undefined"
           :loading="hasWait(waits.onHomeZ)"
-          :disabled="!klippyReady || printerPrinting || hasWaits"
+          :disabled="!klippyReady || printerPrinting"
           @click="sendGcode('G28 Z', waits.onHomeZ)"
           :tooltip="$t('app.tool.tooltip.home_z')"
           icon="$home">
@@ -66,7 +66,7 @@
         <app-btn-toolhead-move
           :color="(!xHomed) ? 'primary' : undefined"
           :loading="hasWait(waits.onHomeX)"
-          :disabled="!klippyReady || printerPrinting || hasWaits"
+          :disabled="!klippyReady || printerPrinting"
           @click="sendGcode('G28 X', waits.onHomeX)"
           icon="$home"
           small-icon>
@@ -78,22 +78,22 @@
       <v-col cols="auto" class="ml-12 mr-7">
         <app-btn-toolhead-move
           @click="sendMoveGcode('Y', toolheadMoveLength, true)"
-          :disabled="hasWaits || !xyHomed || !klippyReady"
+          :disabled="!xyHomed || !klippyReady"
           icon="$down">
         </app-btn-toolhead-move>
       </v-col>
       <v-col cols="auto" class="ml-7">
         <app-btn-toolhead-move
           @click="sendMoveGcode('Z', toolheadMoveLength, true)"
-          :disabled="hasWaits || !zHomed || !klippyReady"
+          :disabled="!zHomed || !klippyReady"
           icon="$down">
         </app-btn-toolhead-move>
       </v-col>
       <v-col class="ml-2" v-if="canHomeXY">
         <app-btn-toolhead-move
           :color="(!yHomed) ? 'primary' : undefined"
           :loading="hasWait(waits.onHomeY)"
-          :disabled="!klippyReady || printerPrinting || hasWaits"
+          :disabled="!klippyReady || printerPrinting"
           @click="sendGcode('G28 Y', waits.onHomeY)"
           icon="$home"
           small-icon>

diff --git a/todo.md b/todo.md
@@ -2,7 +2,6 @@
 
 ## Next Up
 
-- cancel uploads
 - sync instances across moonraker db
 - use components instead of plugins with moonraker
 - add cpu time / resource monitor
@@ -17,6 +16,7 @@
   - warn on cputime too high
   - warn on systeim too high
   - allow a way to configure if a warning is persistent or not
+- cancel uploads
 
 ### Features