3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-08 14:34:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merge branch 'master' into feature_multiextruder_machinesettings

Browse source
This commit is contained in:
fieldOfView 2017-04-21 19:31:44 +02:00
commit 4d12ab1296
157 changed files with 24335 additions and 2374 deletions
Download patch file Download diff file Expand all files Collapse all files

16
resources/qml/SidebarSimple.qml
View file

@ -33,7 +33,7 @@ Item
width: base.width * .45 - UM.Theme.getSize("default_margin").width
height: childrenRect.height
Label
Text
{
id: infillLabel
//: Infill selection label
@ -162,7 +162,7 @@ Item
}
}
}
Label
Text
{
id: infillLabel
font: UM.Theme.getFont("default")
@ -225,14 +225,14 @@ Item
anchors.right: parent.right
height: childrenRect.height
Label
Text
{
id: enableSupportLabel
anchors.left: parent.left
anchors.leftMargin: UM.Theme.getSize("default_margin").width
anchors.verticalCenter: enableSupportCheckBox.verticalCenter
width: parent.width * .45 - 3 * UM.Theme.getSize("default_margin").width
text: catalog.i18nc("@label", "Enable Support");
text: catalog.i18nc("@label", "Generate Support");
font: UM.Theme.getFont("default");
color: UM.Theme.getColor("text");
}
@ -263,7 +263,7 @@ Item
onEntered:
{
base.showTooltip(enableSupportCheckBox, Qt.point(-enableSupportCheckBox.x, 0),
catalog.i18nc("@label", "Enable support structures. These structures support parts of the model with severe overhangs."));
catalog.i18nc("@label", "Generate structures to support parts of the model which have overhangs. Without these structures, such parts would collapse during printing."));
}
onExited:
{
@ -272,7 +272,7 @@ Item
}
}
Label
Text
{
id: supportExtruderLabel
visible: (supportEnabled.properties.value == "True") && (machineExtruderCount.properties.value > 1)
@ -372,7 +372,7 @@ Item
}
Label
Text
{
id: adhesionHelperLabel
anchors.left: parent.left
@ -470,7 +470,7 @@ Item
width: parent.width
height: childrenRect.height
Label
Text
{
anchors.left: parent.left
anchors.leftMargin: UM.Theme.getSize("default_margin").width