GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-18 16:35:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Ultimaker/Cura

Browse Source
This commit is contained in:
Jaime van Kessel 2017-04-14 14:22:06 +02:00
commit 5fcb7714af
10 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/definitions/fdmprinter.def.json
View File

@ -3555,7 +3555,7 @@
"value": "resolveOrValue('layer_height') * 1.5",
"minimum_value": "0.001",
"minimum_value_warning": "0.04",
"maximum_value_warning": "0.75 * extruderValue(adhesion_extruder_nr, 'raft_interface_line_width')",
"maximum_value_warning": "0.75 * extruderValue(adhesion_extruder_nr, 'machine_nozzle_size')",
"enabled": "resolveOrValue('adhesion_type') == 'raft'",
"settable_per_mesh": false,
"settable_per_extruder": true,

32
resources/qml/PrintMonitor.qml
View File

@ -27,7 +27,7 @@ Column
height: childrenRect.height + UM.Theme.getSize("default_margin").height * 2
color: UM.Theme.getColor("setting_category")
Label
Text
{
id: connectedPrinterNameLabel
text: connectedPrinter != null ? connectedPrinter.name : catalog.i18nc("@info:status", "No printer connected")
@ -37,7 +37,7 @@ Column
anchors.top: parent.top
anchors.margins: UM.Theme.getSize("default_margin").width
}
Label
Text
{
id: connectedPrinterAddressLabel
text: (connectedPrinter != null && connectedPrinter.address != null) ? connectedPrinter.address : ""
@ -47,7 +47,7 @@ Column
anchors.right: parent.right
anchors.margins: UM.Theme.getSize("default_margin").width
}
Label
Text
{
text: connectedPrinter != null ? connectedPrinter.connectionText : catalog.i18nc("@info:status", "The printer is not connected.")
color: connectedPrinter != null && connectedPrinter.acceptsCommands ? UM.Theme.getColor("setting_control_text") : UM.Theme.getColor("setting_control_disabled_text")
@ -85,7 +85,7 @@ Column
width: index == machineExtruderCount.properties.value - 1 && index % 2 == 0 ? extrudersGrid.width : extrudersGrid.width / 2 - UM.Theme.getSize("sidebar_lining_thin").width / 2
height: UM.Theme.getSize("sidebar_extruder_box").height
Label //Extruder name.
Text //Extruder name.
{
text: ExtruderManager.getExtruderName(index) != "" ? ExtruderManager.getExtruderName(index) : catalog.i18nc("@label", "Hotend")
color: UM.Theme.getColor("text")
@ -94,7 +94,7 @@ Column
anchors.top: parent.top
anchors.margins: UM.Theme.getSize("default_margin").width
}
Label //Temperature indication.
Text //Temperature indication.
{
id: extruderTemperature
text: (connectedPrinter != null && connectedPrinter.hotendIds[index] != null && connectedPrinter.hotendTemperatures[index] != null) ? Math.round(connectedPrinter.hotendTemperatures[index]) + "°C" : ""
@ -161,7 +161,7 @@ Column
}
}
}
Label //Material name.
Text //Material name.
{
id: materialName
text: (connectedPrinter != null && connectedPrinter.materialNames[index] != null && connectedPrinter.materialIds[index] != "") ? connectedPrinter.materialNames[index] : ""
@ -193,7 +193,7 @@ Column
}
}
}
Label //Variant name.
Text //Variant name.
{
id: variantName
text: (connectedPrinter != null && connectedPrinter.hotendIds[index] != null) ? connectedPrinter.hotendIds[index] : ""
@ -244,7 +244,7 @@ Column
height: machineHeatedBed.properties.value == "True" ? UM.Theme.getSize("sidebar_extruder_box").height : 0
visible: machineHeatedBed.properties.value == "True"
Label //Build plate label.
Text //Build plate label.
{
text: catalog.i18nc("@label", "Build plate")
font: UM.Theme.getFont("default")
@ -253,7 +253,7 @@ Column
anchors.top: parent.top
anchors.margins: UM.Theme.getSize("default_margin").width
}
Label //Target temperature.
Text //Target temperature.
{
id: bedTargetTemperature
text: connectedPrinter != null ? connectedPrinter.targetBedTemperature + "°C" : ""
@ -285,7 +285,7 @@ Column
}
}
}
Label //Current temperature.
Text //Current temperature.
{
id: bedCurrentTemperature
text: connectedPrinter != null ? connectedPrinter.bedTemperature + "°C" : ""
@ -353,7 +353,7 @@ Column
color: UM.Theme.getColor("setting_control_highlight")
opacity: preheatTemperatureControl.hovered ? 1.0 : 0
}
Label //Maximum temperature indication.
Text //Maximum temperature indication.
{
text: (bedTemperature.properties.maximum_value != "None" ? bedTemperature.properties.maximum_value : "") + "°C"
color: UM.Theme.getColor("setting_unit")
@ -452,7 +452,7 @@ Column
}
}
}
Label
Text
{
id: preheatCountdown
text: connectedPrinter != null ? connectedPrinter.preheatBedRemainingTime : ""
@ -546,7 +546,7 @@ Column
}
}
Label
Text
{
id: actualLabel
anchors.centerIn: parent
@ -662,7 +662,7 @@ Column
anchors.left: parent.left
anchors.leftMargin: UM.Theme.getSize("default_margin").width
Label
Text
{
width: parent.width * 0.4
anchors.verticalCenter: parent.verticalCenter
@ -671,7 +671,7 @@ Column
font: UM.Theme.getFont("default")
elide: Text.ElideRight
}
Label
Text
{
width: parent.width * 0.6
anchors.verticalCenter: parent.verticalCenter
@ -692,7 +692,7 @@ Column
width: base.width
height: UM.Theme.getSize("section").height
Label
Text
{
anchors.verticalCenter: parent.verticalCenter
anchors.left: parent.left

2
resources/qml/SaveButton.qml
View File

@ -44,7 +44,7 @@ Item {
}
}
Label {
Text {
id: statusLabel
width: parent.width - 2 * UM.Theme.getSize("default_margin").width
anchors.top: parent.top

2
resources/qml/Sidebar.qml
View File

@ -332,7 +332,7 @@ Rectangle
}
}
Label {
Text {
id: settingsModeLabel
text: !hideSettings ? catalog.i18nc("@label:listbox", "Print Setup") : catalog.i18nc("@label:listbox","Print Setup disabled\nG-code files cannot be modified");
anchors.left: parent.left

6
resources/qml/SidebarHeader.qml
View File

@ -128,7 +128,7 @@ Column
border.color: UM.Theme.getColor("setting_control_border")
}
Label
Text
{
anchors.verticalCenter: parent.verticalCenter
anchors.left: swatch.visible ? swatch.right : parent.left
@ -174,7 +174,7 @@ Column
rightMargin: UM.Theme.getSize("default_margin").width
}
Label
Text
{
id: variantLabel
text:
@ -272,7 +272,7 @@ Column
}
Label
Text
{
id: globalProfileLabel
text: catalog.i18nc("@label","Profile:");

12
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,7 +225,7 @@ Item
anchors.right: parent.right
height: childrenRect.height
Label
Text
{
id: enableSupportLabel
anchors.left: parent.left
@ -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

2
resources/qml/SidebarTooltip.qml
View File

@ -43,7 +43,7 @@ UM.PointingRectangle {
base.opacity = 0;
}
Label {
Text {
id: label;
anchors {
top: parent.top;

2
resources/quality/ultimaker3/um3_aa0.8_Nylon_Draft_Print.inst.cfg
View File

@ -10,7 +10,7 @@ material = generic_nylon_ultimaker3_AA_0.8
weight = -2
[values]
brim_width = 3
brim_width = 5.6
cool_min_layer_time_fan_speed_max = 20
cool_min_speed = 10
infill_before_walls = True

2
resources/quality/ultimaker3/um3_aa0.8_Nylon_Superdraft_Print.inst.cfg
View File

@ -10,7 +10,7 @@ material = generic_nylon_ultimaker3_AA_0.8
weight = -4
[values]
brim_width = 3
brim_width = 5.6
cool_min_layer_time_fan_speed_max = 20
cool_min_speed = 10
infill_before_walls = True

2
resources/quality/ultimaker3/um3_aa0.8_Nylon_Verydraft_Print.inst.cfg
View File

@ -10,7 +10,7 @@ material = generic_nylon_ultimaker3_AA_0.8
weight = -3
[values]
brim_width = 3
brim_width = 5.6
cool_min_layer_time_fan_speed_max = 20
cool_min_speed = 10
infill_before_walls = True