3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-15 10:47:49 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

styling of the UMO wizard pages

Browse source 
fixes issue CURA-64
This commit is contained in:
Tamara Hogenhout 2015-09-16 16:22:34 +02:00
parent fccf365424
commit bb961ad1b1
5 changed files with 335 additions and 178 deletions
Download patch file Download diff file Expand all files Collapse all files

23
resources/qml/WizardPages/AddMachine.qml
View file

@ -3,7 +3,6 @@
import QtQuick 2.2 import QtQuick 2.2
import QtQuick.Controls 1.1 import QtQuick.Controls 1.1
import QtQuick.Layouts 1.1
import QtQuick.Window 2.1 import QtQuick.Window 2.1
import QtQuick.Controls.Styles 1.1 import QtQuick.Controls.Styles 1.1
@ -80,13 +79,7 @@ Item
section.property: "manufacturer" section.property: "manufacturer"
section.delegate: Button { section.delegate: Button {
text: { text: section + " "
if (base,activeManufacturer == section)
return section + " ▼"
else
return section + " ►"
}
style: ButtonStyle { style: ButtonStyle {
background: Rectangle { background: Rectangle {
id: manufacturerBackground id: manufacturerBackground
@ -100,6 +93,17 @@ Item
text: control.text text: control.text
color: palette.windowText color: palette.windowText
font.bold: true 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 Label
{ {
id: author 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; text: model.author;
anchors.left: machineButton.right anchors.left: machineButton.right
anchors.leftMargin: UM.Theme.sizes.standard_list_lineheight.height/2 anchors.leftMargin: UM.Theme.sizes.standard_list_lineheight.height/2

26
resources/qml/WizardPages/Bedleveling.qml
View file

@ -8,7 +8,7 @@ import QtQuick.Window 2.1
import UM 1.1 as UM import UM 1.1 as UM
Column Item
{ {
id: wizardPage id: wizardPage
property int leveling_state: 0 property int leveling_state: 0
@ -22,25 +22,42 @@ Column
Label Label
{ {
id: pageTitle
width: parent.width
text: catalog.i18nc("@title", "Bed Leveling") text: catalog.i18nc("@title", "Bed Leveling")
wrapMode: Text.WordWrap
font.pointSize: 18; font.pointSize: 18;
} }
Label Label
{ {
id: pageDescription id: pageDescription
anchors.top: pageTitle.bottom
anchors.topMargin: UM.Theme.sizes.default_margin.height
width: parent.width width: parent.width
wrapMode: Text.WordWrap 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.") 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 Label
{ {
id: bedelevelingText
anchors.top: pageDescription.bottom
anchors.topMargin: UM.Theme.sizes.default_margin.height
width: parent.width width: parent.width
wrapMode: Text.WordWrap 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.") 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.")
} }
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 Button
{ {
id: bedelevelingButton
anchors.top: parent.top
anchors.left: parent.left
text: catalog.i18nc("@action:button","Move to Next Position"); text: catalog.i18nc("@action:button","Move to Next Position");
onClicked: onClicked:
{ {
@ -63,7 +80,14 @@ Column
Button 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"); text: catalog.i18nc("@action:button","Skip Bedleveling");
onClicked: base.visible = false;
}
} }
function threePointLeveling(width, height) function threePointLeveling(width, height)

29
resources/qml/WizardPages/SelectUpgradedParts.qml
View file

@ -3,7 +3,6 @@
import QtQuick 2.2 import QtQuick 2.2
import QtQuick.Controls 1.1 import QtQuick.Controls 1.1
import QtQuick.Layouts 1.1
import QtQuick.Window 2.1 import QtQuick.Window 2.1
import UM 1.1 as UM import UM 1.1 as UM
@ -15,13 +14,6 @@ Item
SystemPalette{id: palette} SystemPalette{id: palette}
UM.I18nCatalog { id: catalog; name:"cura"} UM.I18nCatalog { id: catalog; name:"cura"}
ScrollView
{
height: parent.height
width: parent.width
Column
{
width: wizardPage.width
Label Label
{ {
id: pageTitle id: pageTitle
@ -33,44 +25,53 @@ Item
Label Label
{ {
id: pageDescription id: pageDescription
//: Add UM Original wizard page description anchors.top: pageTitle.bottom
anchors.topMargin: UM.Theme.sizes.default_margin.height
width: parent.width width: parent.width
wrapMode: Text.WordWrap 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:") 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 Item
{ {
id: pageCheckboxes id: pageCheckboxes
width: parent.width 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 CheckBox
{ {
id: checkBox
text: catalog.i18nc("@option:check","Extruder driver ugrades") text: catalog.i18nc("@option:check","Extruder driver ugrades")
checked: true checked: true
} }
CheckBox CheckBox
{ {
text: catalog.i18nc("@option:check","Heated printer bed (standard kit)") text: catalog.i18nc("@option:check","Heated printer bed (standard kit)")
y: checkBox.height * 1
} }
CheckBox CheckBox
{ {
text: catalog.i18nc("@option:check","Heated printer bed (self built)") text: catalog.i18nc("@option:check","Heated printer bed (self built)")
y: checkBox.height * 2
} }
CheckBox CheckBox
{ {
text: catalog.i18nc("@option:check","Dual extrusion (experimental)") text: catalog.i18nc("@option:check","Dual extrusion (experimental)")
y: checkBox.height * 3
} }
} }
Label Label
{ {
width: parent.width width: parent.width
anchors.top: pageCheckboxes.bottom
anchors.topMargin: UM.Theme.sizes.default_margin.height
wrapMode: Text.WordWrap 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"); 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; } ExclusiveGroup { id: printerGroup; }
} }

181
resources/qml/WizardPages/UltimakerCheckup.qml
View file

@ -3,15 +3,16 @@
import QtQuick 2.2 import QtQuick 2.2
import QtQuick.Controls 1.1 import QtQuick.Controls 1.1
import QtQuick.Layouts 1.1
import QtQuick.Window 2.1 import QtQuick.Window 2.1
import UM 1.1 as UM import UM 1.1 as UM
Column Item
{ {
id: wizardPage id: wizardPage
property string title property string title
property int leftRow: wizardPage.width*0.40
property int rightRow: wizardPage.width*0.60
anchors.fill: parent; anchors.fill: parent;
property bool x_min_pressed: false property bool x_min_pressed: false
property bool y_min_pressed: false property bool y_min_pressed: false
@ -34,88 +35,171 @@ Column
} }
Label Label
{ {
id: pageTitle
width: parent.width
text: catalog.i18nc("@title", "Check Printer") text: catalog.i18nc("@title", "Check Printer")
wrapMode: Text.WordWrap
font.pointSize: 18; font.pointSize: 18;
} }
Label 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"); 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");
} }
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 Button
{ {
id: startCheckButton
anchors.top: parent.top
anchors.left: parent.left
text: catalog.i18nc("@action:button","Start Printer Check"); text: catalog.i18nc("@action:button","Start Printer Check");
enabled: manager.progress >= 100; enabled: manager.progress >= 100;
onClicked: base.visible = false; onClicked: {
checkupContent.visible = true
startCheckButton.enabled = false
}
} }
Button 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"); text: catalog.i18nc("@action:button","Skip Printer Check");
enabled: manager.progress >= 100; enabled: manager.progress >= 100;
onClicked: base.visible = false; onClicked: {
base.currentPage += 1
}
}
} }
Row Item{
{ id: checkupContent
anchors.top: startStopButtons.bottom
anchors.topMargin: UM.Theme.sizes.default_margin.height
visible: false
//////////////////////////////////////////////////////////
Label Label
{ {
id: connectionLabel
width: wizardPage.leftRow
anchors.left: parent.left
anchors.top: parent.top
wrapMode: Text.WordWrap
text: catalog.i18nc("@label","Connection: ") text: catalog.i18nc("@label","Connection: ")
} }
Label 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") text: UM.USBPrinterManager.connectedPrinterList.count ? catalog.i18nc("@info:status","Done"):catalog.i18nc("@info:status","Incomplete")
} }
} //////////////////////////////////////////////////////////
Row
{
Label Label
{ {
id: endstopXLabel
width: wizardPage.leftRow
anchors.left: parent.left
anchors.top: connectionLabel.bottom
wrapMode: Text.WordWrap
text: catalog.i18nc("@label","Min endstop X: ") text: catalog.i18nc("@label","Min endstop X: ")
} }
Label 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") text: x_min_pressed ? catalog.i18nc("@info:status","Works") : catalog.i18nc("@info:status","Not checked")
} }
} //////////////////////////////////////////////////////////////
Row
{
Label Label
{ {
id: endstopYLabel
width: wizardPage.leftRow
anchors.left: parent.left
anchors.top: endstopXLabel.bottom
wrapMode: Text.WordWrap
text: catalog.i18nc("@label","Min endstop Y: ") text: catalog.i18nc("@label","Min endstop Y: ")
} }
Label 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") text: y_min_pressed ? catalog.i18nc("@info:status","Works") : catalog.i18nc("@info:status","Not checked")
} }
} /////////////////////////////////////////////////////////////////////
Row
{
Label Label
{ {
id: endstopZLabel
width: wizardPage.leftRow
anchors.left: parent.left
anchors.top: endstopYLabel.bottom
wrapMode: Text.WordWrap
text: catalog.i18nc("@label","Min endstop Z: ") text: catalog.i18nc("@label","Min endstop Z: ")
} }
Label 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") text: z_min_pressed ? catalog.i18nc("@info:status","Works") : catalog.i18nc("@info:status","Not checked")
} }
} ////////////////////////////////////////////////////////////
Row
{
Label Label
{ {
id: nozzleTempLabel
width: wizardPage.leftRow
anchors.left: parent.left
anchors.top: endstopZLabel.bottom
wrapMode: Text.WordWrap
text: catalog.i18nc("@label","Nozzle temperature check: ") text: catalog.i18nc("@label","Nozzle temperature check: ")
} }
Label 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")
} }
Item
{
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 Button
{ {
height: nozzleTemp.height - 2
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
text: catalog.i18nc("@action:button","Start Heating") text: catalog.i18nc("@action:button","Start Heating")
onClicked: onClicked:
{ {
@ -127,40 +211,73 @@ Column
} }
} }
} }
}
Label Label
{ {
id: heater_status_label id: nozzleTemp
text: catalog.i18nc("@info:status","Not checked") 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 Label
{ {
id: bedTempLabel
width: wizardPage.leftRow
anchors.left: parent.left
anchors.top: nozzleTempLabel.bottom
wrapMode: Text.WordWrap
text: catalog.i18nc("@label","bed temperature check:") text: catalog.i18nc("@label","bed temperature check:")
} }
Label 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")
} }
Item
{
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 Button
{ {
height: bedTemp.height - 2
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
text: catalog.i18nc("@action:button","Start Heating") text: catalog.i18nc("@action:button","Start Heating")
onClicked: onClicked:
{ {
if(printer_connection != null) if(printer_connection != null)
{ {
bed_status_label.text = catalog.i18nc("@info:progress","Checking") bedTempStatus.text = catalog.i18nc("@info:progress","Checking")
printer_connection.printer.heatupBed(60) printer_connection.printer.heatupBed(60)
wizardPage.bed_target_temp = 60 wizardPage.bed_target_temp = 60
} }
} }
} }
}
Label Label
{ {
id: bed_status_label id: bedTemp
text: catalog.i18nc("@info:status","Not checked") 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
} }
} }

32
resources/qml/WizardPages/UpgradeFirmware.qml
View file

@ -3,7 +3,6 @@
import QtQuick 2.2 import QtQuick 2.2
import QtQuick.Controls 1.1 import QtQuick.Controls 1.1
import QtQuick.Layouts 1.1
import QtQuick.Window 2.1 import QtQuick.Window 2.1
import UM 1.1 as UM import UM 1.1 as UM
@ -15,13 +14,6 @@ Item
SystemPalette{id: palette} SystemPalette{id: palette}
UM.I18nCatalog { id: catalog; name:"cura"} UM.I18nCatalog { id: catalog; name:"cura"}
ScrollView
{
height: parent.height
width: parent.width
Column
{
width: wizardPage.width
Label Label
{ {
id: pageTitle id: pageTitle
@ -33,6 +25,8 @@ Item
Label Label
{ {
id: pageDescription id: pageDescription
anchors.top: pageTitle.bottom
anchors.topMargin: UM.Theme.sizes.default_margin.height
width: parent.width width: parent.width
wrapMode: Text.WordWrap 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("@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.")
@ -40,6 +34,9 @@ Item
Label Label
{ {
id: upgradeText1
anchors.top: pageDescription.bottom
anchors.topMargin: UM.Theme.sizes.default_margin.height
width: parent.width width: parent.width
wrapMode: Text.WordWrap 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."); text: catalog.i18nc("@label","The firmware shipping with new Ultimakers works, but upgrades have been made to make better prints, and make calibration easier.");
@ -47,18 +44,35 @@ Item
Label Label
{ {
id: upgradeText2
anchors.top: upgradeText1.bottom
anchors.topMargin: UM.Theme.sizes.default_margin.height
width: parent.width width: parent.width
wrapMode: Text.WordWrap 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."); 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 { Button {
id: upgradeButton
anchors.top: parent.top
anchors.left: parent.left
text: catalog.i18nc("@action:button","Upgrade to Marlin Firmware"); text: catalog.i18nc("@action:button","Upgrade to Marlin Firmware");
} }
Button { 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"); text: catalog.i18nc("@action:button","Skip Upgrade");
onClicked: {
base.currentPage += 1
} }
} }
} }
ExclusiveGroup { id: printerGroup; } ExclusiveGroup { id: printerGroup; }
} }