Changes to skip popup FRE

src/qml/FrePage.qml

@@ -124,6 +124,12 @@ FrePageForm {
                 settingsPage.systemSettingsPage.authorizeAccountPage.authorizeAccountSwipeView.swipeToItem(AuthorizeAccountPage.AuthorizeWithCode)
             } else if(state == "magma_setup_guide1") {
                 state = "magma_setup_guide2"
+            } else if(state == "name_printer") {
+                inFreStep = true
+                mainSwipeView.swipeToItem(MoreporkUI.SettingsPage)
+                settingsPage.settingsSwipeView.swipeToItem(SettingsPage.SystemSettingsPage)
+                settingsPage.systemSettingsPage.systemSettingsSwipeView.swipeToItem(SystemSettingsPage.ChangePrinterNamePage)
+                settingsPage.namePrinter.nameField.forceActiveFocus()
             } else {
                 // For all screens not listed above, the default behavior
                 // is to go to the next step
@@ -142,14 +148,7 @@ FrePageForm {
 
     skipButton {
         onClicked: {
-            if (state == "name_printer") {
-                // Skipping this step is the default
-                inFreStep = true
-                mainSwipeView.swipeToItem(MoreporkUI.SettingsPage)
-                settingsPage.settingsSwipeView.swipeToItem(SettingsPage.SystemSettingsPage)
-                settingsPage.systemSettingsPage.systemSettingsSwipeView.swipeToItem(SystemSettingsPage.ChangePrinterNamePage)
-                settingsPage.namePrinter.nameField.forceActiveFocus()
-            } else if(state == "base state" || state == "welcome") {
+            if(state == "base state" || state == "welcome") {
                 fre.setFreStep(FreStep.StartSetLanguage)
             }
             else if(state == "magma_setup_guide1") {

src/qml/FrePageForm.qml

@@ -904,13 +904,13 @@ LoggingItem {
 
             PropertyChanges {
                 target: freContentRight.buttonPrimary
-                text: qsTr("NEXT")
+                text: qsTr("CHANGE PRINTER NAME")
                 enabled: true
             }
 
             PropertyChanges {
                 target: freContentRight.buttonSecondary1
-                text: qsTr("CHANGE PRINTER NAME")
+                text: qsTr("SKIP")
                 visible: true
             }
 

src/qml/MoreporkUI.qml

@@ -824,13 +824,21 @@ ApplicationWindow {
         CustomPopup {
             popupName: "SkipFreStep"
             id: skipFreStepPopup
-            popupHeight: 285
-            popupWidth: 720
-
+            popupHeight: skipFreStepColumnLayout.height + 140
             showTwoButtons: true
             left_button_text: qsTr("BACK")
             right_button_text: qsTr("CONFIRM")
 
+
+            Timer {
+                id: waitToSkipFreStep
+                interval: 200
+                onTriggered: {
+
+                    fre.gotoNextStep(currentFreStep)
+                }
+            }
+
             left_button.onClicked: {
                 skipFreStepPopup.close()
             }
@@ -839,24 +847,17 @@ ApplicationWindow {
                 if (inFreStep) {
                     currentItem.skipFreStepAction()
                 }
-                if(currentFreStep == FreStep.AttachExtruders ||
-                   currentFreStep == FreStep.LevelBuildPlate ||
-                   currentFreStep == FreStep.CalibrateExtruders ||
-                   currentFreStep == FreStep.MaterialCaseSetup ||
-                   currentFreStep == FreStep.LoadMaterial ||
-                   currentFreStep == FreStep.TestPrint) {
-                    fre.setFreStep(FreStep.FreComplete)
-                }
-                else {
-                    fre.gotoNextStep(currentFreStep)
-                }
+                waitToSkipFreStep.start()
             }
 
             ColumnLayout {
-                width: 720
+                id: skipFreStepColumnLayout
+                height: children.height
+                width: 680
                 anchors.horizontalCenter: parent.horizontalCenter
-                anchors.verticalCenter: parent.verticalCenter
-                anchors.verticalCenterOffset: -40
+                anchors.top: skipFreStepPopup.popupContainer.top
+                anchors.topMargin: 35
+                spacing: 20
 
                 Image {
                     source: "qrc:/img/popup_error.png"
@@ -947,7 +948,7 @@ ApplicationWindow {
                         case FreStep.CalibrateExtruders:
                         case FreStep.MaterialCaseSetup:
                         default:
-                            qsTr("This may skip other set-up procedures as well. You can revisit all steps of the set-up in the settings.")
+                            qsTr("This is required for quality printing. You can revisit any steps from the set-up in the settings menu.")
                             break;
                         }
                     }