Browse Source

Revert "The prepare button slices, so it should be a slice button"

This reverts commit a0263676e1305c2cc4b778ed5cfb7215e938705a.
Mark 6 years ago
parent
commit
c5929ce26c
1 changed files with 7 additions and 7 deletions
  1. 7 7
      resources/qml/SaveButton.qml

+ 7 - 7
resources/qml/SaveButton.qml

@@ -100,8 +100,8 @@ Item {
             if (saveToButton.enabled) {
                 saveToButton.clicked();
             }
-            // slice button
-            if (sliceButton.enabled) {
+            // prepare button
+            if (prepareButton.enabled) {
                 sliceOrStopSlicing();
             }
         }
@@ -131,7 +131,7 @@ Item {
         Row {
             id: additionalComponentsRow
             anchors.top: parent.top
-            anchors.right: saveToButton.visible ? saveToButton.left : (sliceButton.visible ? sliceButton.left : parent.right)
+            anchors.right: saveToButton.visible ? saveToButton.left : (prepareButton.visible ? prepareButton.left : parent.right)
             anchors.rightMargin: UM.Theme.getSize("default_margin").width
 
             spacing: UM.Theme.getSize("default_margin").width
@@ -159,14 +159,14 @@ Item {
             onPreferenceChanged:
             {
                 var autoSlice = UM.Preferences.getValue("general/auto_slice");
-                sliceButton.autoSlice = autoSlice;
+                prepareButton.autoSlice = autoSlice;
                 saveToButton.autoSlice = autoSlice;
             }
         }
 
-        // Slice button, only shows if auto_slice is off
+        // Prepare button, only shows if auto_slice is off
         Button {
-            id: sliceButton
+            id: prepareButton
 
             tooltip: [1, 5].indexOf(base.backendState) != -1 ? catalog.i18nc("@info:tooltip","Slice current printjob") : catalog.i18nc("@info:tooltip","Cancel slicing process")
             // 1 = not started, 2 = Processing
@@ -180,7 +180,7 @@ Item {
             anchors.rightMargin: UM.Theme.getSize("sidebar_margin").width
 
             // 1 = not started, 4 = error, 5 = disabled
-            text: [1, 4, 5].indexOf(base.backendState) != -1 ? catalog.i18nc("@label:Printjob", "Slice") : catalog.i18nc("@label:Printjob", "Cancel")
+            text: [1, 4, 5].indexOf(base.backendState) != -1 ? catalog.i18nc("@label:Printjob", "Prepare") : catalog.i18nc("@label:Printjob", "Cancel")
             onClicked:
             {
                 sliceOrStopSlicing();