diff --git a/resources/qml/WizardPages/AddMachine.qml b/resources/qml/WizardPages/AddMachine.qml index a89fa11a16..ee21ea0f0a 100644 --- a/resources/qml/WizardPages/AddMachine.qml +++ b/resources/qml/WizardPages/AddMachine.qml @@ -206,7 +206,6 @@ Item // Insert new pages (if any) for(var i = 0; i < pages.length; i++) { - console.log(pages[i]) switch(pages[i]) { case "SelectUpgradedParts": base.wizard.appendPage(Qt.resolvedUrl("SelectUpgradedParts.qml"), catalog.i18nc("@title", "Select Upgraded Parts")); diff --git a/resources/qml/WizardPages/Bedleveling.qml b/resources/qml/WizardPages/Bedleveling.qml index 0de0f4d8cf..2c9a153e42 100644 --- a/resources/qml/WizardPages/Bedleveling.qml +++ b/resources/qml/WizardPages/Bedleveling.qml @@ -6,7 +6,7 @@ import QtQuick.Controls 1.1 import QtQuick.Layouts 1.1 import QtQuick.Window 2.1 -import UM 1.0 as UM +import UM 1.1 as UM Column { @@ -19,14 +19,29 @@ Column property variant printer_connection: UM.USBPrinterManager.connectedPrinterList.getItem(0).printer Component.onCompleted: printer_connection.homeHead() UM.I18nCatalog { id: catalog; name:"cura"} + Label { - text: "" - //Component.onCompleted:console.log(UM.Models.settingsModel.getMachineSetting("machine_width")) + text: catalog.i18nc("@title", "Bed Leveling") + font.pointSize: 18; + } + + Label + { + id: pageDescription + width: parent.width + wrapMode: Text.WordWrap + text: catalog.i18nc("@label","To make sure your prints will come out great, you can now adjust your buildplate. When you click 'Move to Next Position' the nozzle will move to the different positions that can be adjusted.") + } + Label + { + width: parent.width + wrapMode: Text.WordWrap + text: catalog.i18nc("@label", "For every postition; insert a piece of paper under the nozzle and adjust the print bed height. The print bed height is right when the paper is slightly gripped by the tip of the nozzle.") } Button { - text: catalog.i18nc("@action:button","Move to next position"); + text: catalog.i18nc("@action:button","Move to Next Position"); onClicked: { if(wizardPage.leveling_state == 0) @@ -41,15 +56,18 @@ Column { printer_connection.moveHead(0, 0 ,0) } - wizardPage.leveling_state++ } } - function threePointLeveling(width, height) + Button { + text: catalog.i18nc("@action:button","Skip Bedleveling"); } + function threePointLeveling(width, height) + { + } } diff --git a/resources/qml/WizardPages/SelectUpgradedParts.qml b/resources/qml/WizardPages/SelectUpgradedParts.qml index 584ae5ffd2..9579d62d68 100644 --- a/resources/qml/WizardPages/SelectUpgradedParts.qml +++ b/resources/qml/WizardPages/SelectUpgradedParts.qml @@ -26,7 +26,7 @@ Item { id: pageTitle width: parent.width - text: wizardPage.title + text: catalog.i18nc("@title", "Select Upgraded Parts") wrapMode: Text.WordWrap font.pointSize: 18 } @@ -51,7 +51,7 @@ Item } CheckBox { - text: catalog.i18nc("@option:check","Heated printer bed (kit)") + text: catalog.i18nc("@option:check","Heated printer bed (standard kit)") } CheckBox { @@ -67,14 +67,7 @@ Item { width: parent.width wrapMode: Text.WordWrap - text: catalog.i18nc("@label","If you have an Ultimaker bought after october 2012 you will have the Extruder drive upgrade. If you do not have this upgrade, it is highly recommended to improve reliability."); - } - - Label - { - width: parent.width - wrapMode: Text.WordWrap - text: catalog.i18nc("@label","This upgrade can be bought from the Ultimaker webshop or found on thingiverse as thing:26094"); + text: catalog.i18nc("@label","If you bought your Ultimaker after october 2012 you will have the Extruder drive upgrade. If you do not have this upgrade, it is highly recommended to improve reliability. This upgrade can be bought from the Ultimaker webshop or found on thingiverse as thing:26094"); } } } diff --git a/resources/qml/WizardPages/UltimakerCheckup.qml b/resources/qml/WizardPages/UltimakerCheckup.qml index 793108e745..40d006467d 100644 --- a/resources/qml/WizardPages/UltimakerCheckup.qml +++ b/resources/qml/WizardPages/UltimakerCheckup.qml @@ -34,14 +34,28 @@ Column } Label { - text: parent.title + text: catalog.i18nc("@title", "Check Printer") font.pointSize: 18; } Label { //: Add Printer wizard page description - text: catalog.i18nc("@label","It's a good idea to do a few sanity checks on your Ultimaker. \n You can skip these if you know your machine is functional"); + text: catalog.i18nc("@label","It's a good idea to do a few sanity checks on your Ultimaker. You can skip this step if you know your machine is functional"); + } + + Button + { + text: catalog.i18nc("@action:button","Start Printer Check"); + enabled: manager.progress >= 100; + onClicked: base.visible = false; + } + + Button + { + text: catalog.i18nc("@action:button","Skip Printer Check"); + enabled: manager.progress >= 100; + onClicked: base.visible = false; } Row @@ -102,7 +116,7 @@ Column } Button { - text: catalog.i18nc("@action:button","Start heating") + text: catalog.i18nc("@action:button","Start Heating") onClicked: { if(printer_connection != null) @@ -124,7 +138,7 @@ Column { Label { - text: catalog.i18nc("@label","bed temperature check: ") + text: catalog.i18nc("@label","bed temperature check:") } Label { @@ -132,7 +146,7 @@ Column } Button { - text: catalog.i18nc("@action:button","Start heating") + text: catalog.i18nc("@action:button","Start Heating") onClicked: { if(printer_connection != null) diff --git a/resources/qml/WizardPages/UpgradeFirmware.qml b/resources/qml/WizardPages/UpgradeFirmware.qml index 8730157170..e25cbfbde4 100644 --- a/resources/qml/WizardPages/UpgradeFirmware.qml +++ b/resources/qml/WizardPages/UpgradeFirmware.qml @@ -6,65 +6,59 @@ import QtQuick.Controls 1.1 import QtQuick.Layouts 1.1 import QtQuick.Window 2.1 -import UM 1.0 as UM +import UM 1.1 as UM -Column +Item { id: wizardPage property string title - anchors.fill: parent; - UM.I18nCatalog { id: catalog; name:"cura"} - Label - { - text: parent.title - font.pointSize: 18; - } + SystemPalette{id: palette} + UM.I18nCatalog { id: catalog; name:"cura"} ScrollView { - height: parent.height - 50 + height: parent.height width: parent.width - ListView + Column { - id: machineList; - model: UM.USBPrinterManager.connectedPrinterList - - delegate:Row + width: wizardPage.width + Label { - id: derp - Text - { - id: text_area - text: model.name - } - Button - { - text: catalog.i18nc("@action:button","Update") + id: pageTitle + width: parent.width + text: catalog.i18nc("@title", "Upgrade Firmware") + wrapMode: Text.WordWrap + font.pointSize: 18 + } + Label + { + id: pageDescription + width: parent.width + wrapMode: Text.WordWrap + text: catalog.i18nc("@label","Firmware is the piece of software running directly on your 3D printer. This firmware controls the step motors, regulates the temperature and ultimately makes your printer work.") + } - onClicked: - { - if(!UM.USBPrinterManager.updateFirmwareBySerial(text_area.text)) - { - status_text.text = catalog.i18nc("@info:status","ERROR") - } - } - } + Label + { + width: parent.width + wrapMode: Text.WordWrap + text: catalog.i18nc("@label","The firmware shipping with new Ultimakers works, but upgrades have been made to make better prints, and make calibration easier."); + } + + Label + { + width: parent.width + wrapMode: Text.WordWrap + text: catalog.i18nc("@label","Cura requires these new features and thus your firmware will most likely need to be upgraded. You can do so now."); + } + Button { + text: catalog.i18nc("@action:button","Upgrade to Marlin Firmware"); + } + Button { + text: catalog.i18nc("@action:button","Skip Upgrade"); } } } - Label - { - id: status_text - text: "" - } - - - Item - { - Layout.fillWidth: true; - Layout.fillHeight: true; - } - - + ExclusiveGroup { id: printerGroup; } } \ No newline at end of file