3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-02 20:52:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '2.3'

Browse source 
Conflicts:
	resources/qml/MonitorButton.qml
This commit is contained in:
Ghostkeeper 2016-09-06 10:43:54 +02:00
commit fcbf4a93f3
No known key found for this signature in database
GPG key ID: 701948C5954A7385
15 changed files with 140 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

14
resources/definitions/fdmprinter.def.json
View file

@ -15,7 +15,8 @@
"machine_extruder_trains":
{
"0": "fdmextruder"
}
},
"supports_usb_connection": true
},
"settings":
{
@ -402,7 +403,7 @@
"description": "The maximum speed of the filament.",
"unit": "mm/s",
"type": "float",
"default_value": 25,
"default_value": 299792458000,
"settable_per_mesh": false,
"settable_per_extruder": false,
"settable_per_meshgroup": false
@ -1160,7 +1161,7 @@
"default_value": 25,
"minimum_value": "0",
"maximum_value": "machine_max_feedrate_e",
"maximum_value_warning": "100",
"maximum_value_warning": "25",
"enabled": "retraction_enable",
"settable_per_mesh": false,
"settable_per_extruder": true,
@ -1173,7 +1174,7 @@
"default_value": 25,
"minimum_value": "0",
"maximum_value": "machine_max_feedrate_e",
"maximum_value_warning": "100",
"maximum_value_warning": "25",
"enabled": "retraction_enable",
"value": "retraction_speed",
"settable_per_mesh": false,
@ -1187,7 +1188,7 @@
"default_value": 25,
"minimum_value": "0",
"maximum_value": "machine_max_feedrate_e",
"maximum_value_warning": "100",
"maximum_value_warning": "25",
"enabled": "retraction_enable",
"value": "retraction_speed",
"settable_per_mesh": false,
@ -3518,7 +3519,7 @@
},
"experimental":
{
"label": "Experimental Modes",
"label": "Experimental",
"type": "category",
"icon": "category_experimental",
"description": "experimental!",
@ -3763,6 +3764,7 @@
"type": "float",
"unit": "mm",
"default_value": 3,
"value": "machine_nozzle_head_distance",
"minimum_value": "0.0001",
"maximum_value_warning": "20",
"enabled": "wireframe_enabled",

3
resources/definitions/ultimaker.def.json
View file

@ -9,6 +9,9 @@
"visible": false
},
"overrides": {
"machine_max_feedrate_e": {
"default_value": 45
},
"material_print_temperature": {
"minimum_value": "0"
},

1
resources/qml/Cura.qml
View file

@ -346,6 +346,7 @@ UM.MainWindow
bottom: parent.bottom;
right: parent.right;
}
z: 1
onMonitoringPrintChanged: base.monitoringPrint = monitoringPrint
width: UM.Theme.getSize("sidebar").width;
}

7
resources/qml/MonitorButton.qml
View file

@ -4,7 +4,6 @@
import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Styles 1.1
import QtQuick.Dialogs 1.1
import QtQuick.Layouts 1.1
import UM 1.1 as UM
@ -161,7 +160,7 @@ Rectangle
anchors.rightMargin: UM.Theme.getSize("default_margin").width
text: catalog.i18nc("@label:", "Abort Print")
onClicked: confirmationDialog.visible = true
onClicked: Cura.MachineManager.printerOutputDevices[0].setJobState("abort")
style: ButtonStyle
{
@ -221,9 +220,9 @@ Rectangle
{
id: confirmationDialog
title: catalog.i18nc("@text:MessageDialog", "Abort print")
title: catalog.i18nc("@window:title", "Abort print")
icon: StandardIcon.Warning
text: catalog.i18nc("@text:MessageDialog", "Do you really want to abort the print?")
text: catalog.i18nc("@label", "Are you sure you want to abort the print?")
standardButtons: StandardButton.Yes | StandardButton.No
Component.onCompleted: visible = false
onYes: Cura.MachineManager.printerOutputDevices[0].setJobState("abort")

2
resources/qml/SidebarHeader.qml
View file

@ -277,7 +277,7 @@ Column
height: UM.Theme.getSize("setting_control").height
tooltip: Cura.MachineManager.activeQualityName
style: UM.Theme.styles.sidebar_header_button
property var valueWarning: Cura.MachineManager.activeQualityId == "empty_quality"
menu: ProfileMenu { }
UM.SimpleButton

17
resources/themes/cura/styles.qml
View file

@ -11,7 +11,22 @@ QtObject {
property Component sidebar_header_button: Component {
ButtonStyle {
background: Rectangle {
color: control.enabled ? Theme.getColor("setting_control") : Theme.getColor("setting_control_disabled")
color:
{
if(control.enabled)
{
if(control.valueWarning)
{
return Theme.getColor("setting_validation_warning");
} else
{
return Theme.getColor("setting_control");
}
} else {
return Theme.getColor("setting_control_disabled");
}
}
border.width: Theme.getSize("default_lining").width
border.color: !control.enabled ? Theme.getColor("setting_control_disabled_border") :
control.hovered ? Theme.getColor("setting_control_border_highlight") : Theme.getColor("setting_control_border")