diff --git a/resources/qml/WizardPages/AddMachine.qml b/resources/qml/WizardPages/AddMachine.qml index ee21ea0f0a..db6dde12f0 100644 --- a/resources/qml/WizardPages/AddMachine.qml +++ b/resources/qml/WizardPages/AddMachine.qml @@ -3,7 +3,6 @@ import QtQuick 2.2 import QtQuick.Controls 1.1 -import QtQuick.Layouts 1.1 import QtQuick.Window 2.1 import QtQuick.Controls.Styles 1.1 @@ -80,13 +79,7 @@ Item section.property: "manufacturer" section.delegate: Button { - text: { - if (base,activeManufacturer == section) - return section + " ▼" - else - return section + " ►" - } - + text: section + " " style: ButtonStyle { background: Rectangle { id: manufacturerBackground @@ -100,6 +93,17 @@ Item text: control.text color: palette.windowText font.bold: true + UM.RecolorImage { + id: downArrow + anchors.verticalCenter: parent.verticalCenter + anchors.left: parent.right + width: UM.Theme.sizes.standard_arrow.width + height: UM.Theme.sizes.standard_arrow.height + sourceSize.width: width + sourceSize.height: width + color: palette.windowText + source: base,activeManufacturer == section ? UM.Theme.icons.arrow_bottom : UM.Theme.icons.arrow_right + } } } @@ -136,9 +140,6 @@ Item Label { id: author -// visible: model.author != "Ultimaker" ? true : false - //: Printer profile caption meaning: this profile is supported by the community -// text: qsTr("community supported profile"); text: model.author; anchors.left: machineButton.right anchors.leftMargin: UM.Theme.sizes.standard_list_lineheight.height/2 diff --git a/resources/qml/WizardPages/Bedleveling.qml b/resources/qml/WizardPages/Bedleveling.qml index 2c9a153e42..e8c3500eae 100644 --- a/resources/qml/WizardPages/Bedleveling.qml +++ b/resources/qml/WizardPages/Bedleveling.qml @@ -8,7 +8,7 @@ import QtQuick.Window 2.1 import UM 1.1 as UM -Column +Item { id: wizardPage property int leveling_state: 0 @@ -22,48 +22,72 @@ Column Label { + id: pageTitle + width: parent.width text: catalog.i18nc("@title", "Bed Leveling") + wrapMode: Text.WordWrap font.pointSize: 18; } Label { id: pageDescription + anchors.top: pageTitle.bottom + anchors.topMargin: UM.Theme.sizes.default_margin.height 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 { + id: bedelevelingText + anchors.top: pageDescription.bottom + anchors.topMargin: UM.Theme.sizes.default_margin.height 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"); - onClicked: + + Item{ + anchors.top: bedelevelingText.bottom + anchors.topMargin: UM.Theme.sizes.default_margin.height + anchors.horizontalCenter: parent.horizontalCenter + width: bedelevelingButton.width + skipBedlevelingButton.width + UM.Theme.sizes.default_margin.height < wizardPage.width ? bedelevelingButton.width + skipBedlevelingButton.width + UM.Theme.sizes.default_margin.height : wizardPage.width + Button { - if(wizardPage.leveling_state == 0) + id: bedelevelingButton + anchors.top: parent.top + anchors.left: parent.left + text: catalog.i18nc("@action:button","Move to Next Position"); + onClicked: { - printer_connection.moveHead(platform_width /2 , platform_height,0) - } - if(wizardPage.leveling_state == 1) - { - printer_connection.moveHead(platform_width , 0,0) - } - if(wizardPage.leveling_state == 2) - { - printer_connection.moveHead(0, 0 ,0) - } - wizardPage.leveling_state++ + if(wizardPage.leveling_state == 0) + { + printer_connection.moveHead(platform_width /2 , platform_height,0) + } + if(wizardPage.leveling_state == 1) + { + printer_connection.moveHead(platform_width , 0,0) + } + if(wizardPage.leveling_state == 2) + { + printer_connection.moveHead(0, 0 ,0) + } + wizardPage.leveling_state++ + } } - } - Button - { - text: catalog.i18nc("@action:button","Skip Bedleveling"); + Button + { + id: skipBedlevelingButton + anchors.top: parent.width < wizardPage.width ? parent.top : bedelevelingButton.bottom + anchors.topMargin: parent.width < wizardPage.width ? 0 : UM.Theme.sizes.default_margin.height/2 + anchors.left: parent.width < wizardPage.width ? bedelevelingButton.right : parent.left + anchors.leftMargin: parent.width < wizardPage.width ? UM.Theme.sizes.default_margin.width : 0 + text: catalog.i18nc("@action:button","Skip Bedleveling"); + onClicked: base.visible = false; + } } function threePointLeveling(width, height) diff --git a/resources/qml/WizardPages/SelectUpgradedParts.qml b/resources/qml/WizardPages/SelectUpgradedParts.qml index 9579d62d68..167c110a70 100644 --- a/resources/qml/WizardPages/SelectUpgradedParts.qml +++ b/resources/qml/WizardPages/SelectUpgradedParts.qml @@ -3,7 +3,6 @@ import QtQuick 2.2 import QtQuick.Controls 1.1 -import QtQuick.Layouts 1.1 import QtQuick.Window 2.1 import UM 1.1 as UM @@ -15,61 +14,63 @@ Item SystemPalette{id: palette} UM.I18nCatalog { id: catalog; name:"cura"} - ScrollView + Label { - height: parent.height + id: pageTitle width: parent.width - Column + text: catalog.i18nc("@title", "Select Upgraded Parts") + wrapMode: Text.WordWrap + font.pointSize: 18 + } + Label + { + id: pageDescription + anchors.top: pageTitle.bottom + anchors.topMargin: UM.Theme.sizes.default_margin.height + width: parent.width + wrapMode: Text.WordWrap + text: catalog.i18nc("@label","To assist you in having better default settings for your Ultimaker. Cura would like to know which upgrades you have in your machine:") + } + + Item + { + id: pageCheckboxes + height: childrenRect.height + anchors.left: parent.left + anchors.leftMargin: UM.Theme.sizes.default_margin.width + anchors.top: pageDescription.bottom + anchors.topMargin: UM.Theme.sizes.default_margin.height + width: parent.width - UM.Theme.sizes.default_margin.width + CheckBox { - width: wizardPage.width - Label - { - id: pageTitle - width: parent.width - text: catalog.i18nc("@title", "Select Upgraded Parts") - wrapMode: Text.WordWrap - font.pointSize: 18 - } - Label - { - id: pageDescription - //: Add UM Original wizard page description - width: parent.width - wrapMode: Text.WordWrap - text: catalog.i18nc("@label","To assist you in having better default settings for your Ultimaker. Cura would like to know which upgrades you have in your machine:") - } - - Column - { - id: pageCheckboxes - width: parent.width - - CheckBox - { - text: catalog.i18nc("@option:check","Extruder driver ugrades") - checked: true - } - CheckBox - { - text: catalog.i18nc("@option:check","Heated printer bed (standard kit)") - } - CheckBox - { - text: catalog.i18nc("@option:check","Heated printer bed (self built)") - } - CheckBox - { - text: catalog.i18nc("@option:check","Dual extrusion (experimental)") - } - } - - Label - { - width: parent.width - wrapMode: Text.WordWrap - 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"); - } + id: checkBox + text: catalog.i18nc("@option:check","Extruder driver ugrades") + checked: true } + CheckBox + { + text: catalog.i18nc("@option:check","Heated printer bed (standard kit)") + y: checkBox.height * 1 + } + CheckBox + { + text: catalog.i18nc("@option:check","Heated printer bed (self built)") + y: checkBox.height * 2 + } + CheckBox + { + text: catalog.i18nc("@option:check","Dual extrusion (experimental)") + y: checkBox.height * 3 + } + } + + Label + { + width: parent.width + anchors.top: pageCheckboxes.bottom + anchors.topMargin: UM.Theme.sizes.default_margin.height + wrapMode: Text.WordWrap + 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"); } ExclusiveGroup { id: printerGroup; } diff --git a/resources/qml/WizardPages/UltimakerCheckup.qml b/resources/qml/WizardPages/UltimakerCheckup.qml index 40d006467d..b3013be5de 100644 --- a/resources/qml/WizardPages/UltimakerCheckup.qml +++ b/resources/qml/WizardPages/UltimakerCheckup.qml @@ -3,15 +3,16 @@ import QtQuick 2.2 import QtQuick.Controls 1.1 -import QtQuick.Layouts 1.1 import QtQuick.Window 2.1 import UM 1.1 as UM -Column +Item { id: wizardPage property string title + property int leftRow: wizardPage.width*0.40 + property int rightRow: wizardPage.width*0.60 anchors.fill: parent; property bool x_min_pressed: false property bool y_min_pressed: false @@ -34,133 +35,249 @@ Column } Label { + id: pageTitle + width: parent.width text: catalog.i18nc("@title", "Check Printer") + wrapMode: Text.WordWrap font.pointSize: 18; } Label { - //: Add Printer wizard page description + id: pageDescription + anchors.top: pageTitle.bottom + anchors.topMargin: UM.Theme.sizes.default_margin.height + width: parent.width + wrapMode: Text.WordWrap 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; + Item{ + id: startStopButtons + anchors.top: pageDescription.bottom + anchors.topMargin: UM.Theme.sizes.default_margin.height + anchors.horizontalCenter: parent.horizontalCenter + height: childrenRect.height + width: startCheckButton.width + skipCheckButton.width + UM.Theme.sizes.default_margin.height < wizardPage.width ? startCheckButton.width + skipCheckButton.width + UM.Theme.sizes.default_margin.height : wizardPage.width + Button + { + id: startCheckButton + anchors.top: parent.top + anchors.left: parent.left + text: catalog.i18nc("@action:button","Start Printer Check"); + enabled: manager.progress >= 100; + onClicked: { + checkupContent.visible = true + startCheckButton.enabled = false + } + } + + Button + { + id: skipCheckButton + anchors.top: parent.width < wizardPage.width ? parent.top : startCheckButton.bottom + anchors.topMargin: parent.width < wizardPage.width ? 0 : UM.Theme.sizes.default_margin.height/2 + anchors.left: parent.width < wizardPage.width ? startCheckButton.right : parent.left + anchors.leftMargin: parent.width < wizardPage.width ? UM.Theme.sizes.default_margin.width : 0 + text: catalog.i18nc("@action:button","Skip Printer Check"); + enabled: manager.progress >= 100; + onClicked: { + base.currentPage += 1 + } + } } - Button - { - text: catalog.i18nc("@action:button","Skip Printer Check"); - enabled: manager.progress >= 100; - onClicked: base.visible = false; - } - - Row - { + Item{ + id: checkupContent + anchors.top: startStopButtons.bottom + anchors.topMargin: UM.Theme.sizes.default_margin.height + visible: false + ////////////////////////////////////////////////////////// Label { + id: connectionLabel + width: wizardPage.leftRow + anchors.left: parent.left + anchors.top: parent.top + wrapMode: Text.WordWrap text: catalog.i18nc("@label","Connection: ") } Label { + id: connectionStatus + width: wizardPage.rightRow + anchors.left: connectionLabel.right + anchors.top: parent.top + wrapMode: Text.WordWrap text: UM.USBPrinterManager.connectedPrinterList.count ? catalog.i18nc("@info:status","Done"):catalog.i18nc("@info:status","Incomplete") } - } - Row - { + ////////////////////////////////////////////////////////// Label { + id: endstopXLabel + width: wizardPage.leftRow + anchors.left: parent.left + anchors.top: connectionLabel.bottom + wrapMode: Text.WordWrap text: catalog.i18nc("@label","Min endstop X: ") } Label { + id: endstopXStatus + width: wizardPage.rightRow + anchors.left: endstopXLabel.right + anchors.top: connectionLabel.bottom + wrapMode: Text.WordWrap text: x_min_pressed ? catalog.i18nc("@info:status","Works") : catalog.i18nc("@info:status","Not checked") } - } - Row - { + ////////////////////////////////////////////////////////////// Label { + id: endstopYLabel + width: wizardPage.leftRow + anchors.left: parent.left + anchors.top: endstopXLabel.bottom + wrapMode: Text.WordWrap text: catalog.i18nc("@label","Min endstop Y: ") } Label { + id: endstopYStatus + width: wizardPage.rightRow + anchors.left: endstopYLabel.right + anchors.top: endstopXLabel.bottom + wrapMode: Text.WordWrap text: y_min_pressed ? catalog.i18nc("@info:status","Works") : catalog.i18nc("@info:status","Not checked") } - } - - Row - { + ///////////////////////////////////////////////////////////////////// Label { + id: endstopZLabel + width: wizardPage.leftRow + anchors.left: parent.left + anchors.top: endstopYLabel.bottom + wrapMode: Text.WordWrap text: catalog.i18nc("@label","Min endstop Z: ") } Label { + id: endstopZStatus + width: wizardPage.rightRow + anchors.left: endstopZLabel.right + anchors.top: endstopYLabel.bottom + wrapMode: Text.WordWrap text: z_min_pressed ? catalog.i18nc("@info:status","Works") : catalog.i18nc("@info:status","Not checked") } - } - - Row - { + //////////////////////////////////////////////////////////// Label { + id: nozzleTempLabel + width: wizardPage.leftRow + anchors.left: parent.left + anchors.top: endstopZLabel.bottom + wrapMode: Text.WordWrap text: catalog.i18nc("@label","Nozzle temperature check: ") } Label { - text: printer_connection != null ? printer_connection.extruderTemperature : "0" + id: nozzleTempStatus + width: wizardPage.rightRow * 0.4 + anchors.top: nozzleTempLabel.top + anchors.left: nozzleTempLabel.right + wrapMode: Text.WordWrap + text: catalog.i18nc("@info:status","Not checked") } - Button + Item { - text: catalog.i18nc("@action:button","Start Heating") - onClicked: + id: nozzleTempButton + width: wizardPage.rightRow * 0.3 + height: nozzleTemp.height + anchors.top: nozzleTempLabel.top + anchors.left: bedTempStatus.right + anchors.leftMargin: UM.Theme.sizes.default_margin.width/2 + Button { - if(printer_connection != null) + height: nozzleTemp.height - 2 + anchors.verticalCenter: parent.verticalCenter + anchors.horizontalCenter: parent.horizontalCenter + text: catalog.i18nc("@action:button","Start Heating") + onClicked: { - heater_status_label.text = catalog.i18nc("@info:progress","Checking") - printer_connection.heatupNozzle(190) - wizardPage.extruder_target_temp = 190 + if(printer_connection != null) + { + heater_status_label.text = catalog.i18nc("@info:progress","Checking") + printer_connection.heatupNozzle(190) + wizardPage.extruder_target_temp = 190 + } } } } Label { - id: heater_status_label - text: catalog.i18nc("@info:status","Not checked") + id: nozzleTemp + anchors.top: nozzleTempLabel.top + anchors.left: nozzleTempButton.right + anchors.leftMargin: UM.Theme.sizes.default_margin.width + width: wizardPage.rightRow * 0.2 + wrapMode: Text.WordWrap + text: printer_connection != null ? printer_connection.extruderTemperature + "°C" : "0°C" + font.bold: true } - } - - Row - { + ///////////////////////////////////////////////////////////////////////////// Label { + id: bedTempLabel + width: wizardPage.leftRow + anchors.left: parent.left + anchors.top: nozzleTempLabel.bottom + wrapMode: Text.WordWrap text: catalog.i18nc("@label","bed temperature check:") } + Label { - text: printer_connection != null ? printer_connection.bedTemperature : "0" + id: bedTempStatus + width: wizardPage.rightRow * 0.4 + anchors.top: bedTempLabel.top + anchors.left: bedTempLabel.right + wrapMode: Text.WordWrap + text: catalog.i18nc("@info:status","Not checked") } - Button + Item { - text: catalog.i18nc("@action:button","Start Heating") - onClicked: + id: bedTempButton + width: wizardPage.rightRow * 0.3 + height: bedTemp.height + anchors.top: bedTempLabel.top + anchors.left: bedTempStatus.right + anchors.leftMargin: UM.Theme.sizes.default_margin.width/2 + Button { - if(printer_connection != null) + height: bedTemp.height - 2 + anchors.verticalCenter: parent.verticalCenter + anchors.horizontalCenter: parent.horizontalCenter + text: catalog.i18nc("@action:button","Start Heating") + onClicked: { - bed_status_label.text = catalog.i18nc("@info:progress","Checking") - printer_connection.printer.heatupBed(60) - wizardPage.bed_target_temp = 60 + if(printer_connection != null) + { + bedTempStatus.text = catalog.i18nc("@info:progress","Checking") + printer_connection.printer.heatupBed(60) + wizardPage.bed_target_temp = 60 + } } } } Label { - id: bed_status_label - text: catalog.i18nc("@info:status","Not checked") + id: bedTemp + width: wizardPage.rightRow * 0.2 + anchors.top: bedTempLabel.top + anchors.left: bedTempButton.right + anchors.leftMargin: UM.Theme.sizes.default_margin.width + wrapMode: Text.WordWrap + text: printer_connection != null ? printer_connection.bedTemperature + "°C": "0°C" + font.bold: true } } diff --git a/resources/qml/WizardPages/UpgradeFirmware.qml b/resources/qml/WizardPages/UpgradeFirmware.qml index e25cbfbde4..edf075ee60 100644 --- a/resources/qml/WizardPages/UpgradeFirmware.qml +++ b/resources/qml/WizardPages/UpgradeFirmware.qml @@ -3,7 +3,6 @@ import QtQuick 2.2 import QtQuick.Controls 1.1 -import QtQuick.Layouts 1.1 import QtQuick.Window 2.1 import UM 1.1 as UM @@ -15,50 +14,65 @@ Item SystemPalette{id: palette} UM.I18nCatalog { id: catalog; name:"cura"} - ScrollView + Label { - height: parent.height + id: pageTitle width: parent.width - Column - { - width: wizardPage.width - Label - { - 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.") - } + text: catalog.i18nc("@title", "Upgrade Firmware") + wrapMode: Text.WordWrap + font.pointSize: 18 + } + Label + { + id: pageDescription + anchors.top: pageTitle.bottom + anchors.topMargin: UM.Theme.sizes.default_margin.height + 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.") + } - 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 + { + id: upgradeText1 + anchors.top: pageDescription.bottom + anchors.topMargin: UM.Theme.sizes.default_margin.height + 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: upgradeText2 + anchors.top: upgradeText1.bottom + anchors.topMargin: UM.Theme.sizes.default_margin.height + 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."); + } + Item{ + anchors.top: upgradeText2.bottom + anchors.topMargin: UM.Theme.sizes.default_margin.height + anchors.horizontalCenter: parent.horizontalCenter + width: upgradeButton.width + skipUpgradeButton.width + UM.Theme.sizes.default_margin.height < wizardPage.width ? upgradeButton.width + skipUpgradeButton.width + UM.Theme.sizes.default_margin.height : wizardPage.width + Button { + id: upgradeButton + anchors.top: parent.top + anchors.left: parent.left + text: catalog.i18nc("@action:button","Upgrade to Marlin Firmware"); + } + Button { + id: skipUpgradeButton + anchors.top: parent.width < wizardPage.width ? parent.top : upgradeButton.bottom + anchors.topMargin: parent.width < wizardPage.width ? 0 : UM.Theme.sizes.default_margin.height/2 + anchors.left: parent.width < wizardPage.width ? upgradeButton.right : parent.left + anchors.leftMargin: parent.width < wizardPage.width ? UM.Theme.sizes.default_margin.width : 0 + text: catalog.i18nc("@action:button","Skip Upgrade"); + onClicked: { + base.currentPage += 1 } } } - ExclusiveGroup { id: printerGroup; } } \ No newline at end of file