Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3

This commit is contained in:
Tim Kuipers 2016-09-08 16:19:06 +02:00
commit 84fb59a0f3
34 changed files with 318 additions and 96 deletions

View file

@ -10,6 +10,7 @@
"manufacturer": "Ultimaker",
"file_formats": "text/x-gcode;application/x-stl-ascii;application/x-stl-binary;application/x-wavefront-obj;application/x3g",
"visible": false,
"has_materials": true,
"preferred_material": "*generic_pla*",
"preferred_quality": "*normal*",
"machine_extruder_trains":
@ -403,7 +404,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
@ -1161,7 +1162,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,
@ -1174,7 +1175,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,
@ -1188,7 +1189,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,
@ -3207,6 +3208,7 @@
"type": "category",
"icon": "category_dual",
"description": "Settings used for printing with multiple extruders.",
"enabled": "machine_extruder_count > 1",
"children":
{
"adhesion_extruder_nr":
@ -3284,6 +3286,7 @@
"default_value": 15,
"value": "15 if prime_tower_enable else 0",
"minimum_value": "0",
"maximum_value": "min(0.5 * machine_width, 0.5 * machine_depth)",
"maximum_value_warning": "20",
"settable_per_mesh": false,
"settable_per_extruder": false

View file

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

View file

@ -14,6 +14,7 @@
"platform": "ultimaker2_platform.obj",
"platform_texture": "Ultimaker2backplate.png",
"platform_offset": [9, 0, 0],
"has_materials": false,
"supported_actions":["UpgradeFirmware"]
},
"overrides": {

View file

@ -78,7 +78,7 @@
"default_value": 185
},
"prime_tower_position_y": {
"default_value": 175
"default_value": 160
}
}
}

View file

@ -14,11 +14,10 @@ Generic Nylon profile. Serves as an example file, data in this file is not corre
<color_code>#3DF266</color_code>
</metadata>
<properties>
<density>1.19</density>
<density>1.14</density>
<diameter>2.85</diameter>
</properties>
<settings>
<setting key="hardware compatible">no</setting><!-- This material is not supported on most printers due to high temperatures -->
<setting key="print temperature">250</setting>
<setting key="heated bed temperature">60</setting>
<setting key="standby temperature">175</setting>

View file

@ -14,7 +14,7 @@ Generic PC profile. Serves as an example file, data in this file is not correct.
<color_code>#F29030</color_code>
</metadata>
<properties>
<density>1.18</density>
<density>1.19</density>
<diameter>2.85</diameter>
</properties>
<settings>

View file

@ -14,7 +14,7 @@ Generic TPU 95A profile. Serves as an example file, data in this file is not cor
<color_code>#B22744</color_code>
</metadata>
<properties>
<density>1.19</density>
<density>1.22</density>
<diameter>2.85</diameter>
</properties>
<settings>

View file

@ -464,12 +464,11 @@ UM.MainWindow
target: Cura.Actions.addProfile
onTriggered:
{
Cura.ContainerManager.createQualityChanges(null);
preferences.setPage(4);
preferences.show();
// Show the renameDialog after a very short delay so the preference page has time to initiate
showProfileNameDialogTimer.start();
// Create a new profile after a very short delay so the preference page has time to initiate
createProfileTimer.start();
}
}
@ -516,11 +515,11 @@ UM.MainWindow
Timer
{
id: showProfileNameDialogTimer
id: createProfileTimer
repeat: false
interval: 1
onTriggered: preferences.getCurrentItem().showProfileNameDialog()
onTriggered: preferences.getCurrentItem().createProfile()
}
// BlurSettings is a way to force the focus away from any of the setting items.

View file

@ -115,7 +115,7 @@ TabView
width: base.secondColumnWidth;
value: properties.density;
decimals: 2
suffix: "g/cm"
suffix: "g/cm³"
stepSize: 0.01
readOnly: !base.editingEnabled;
@ -128,7 +128,7 @@ TabView
width: base.secondColumnWidth;
value: properties.diameter;
decimals: 2
suffix: "mm³"
suffix: "mm"
stepSize: 0.01
readOnly: !base.editingEnabled;

View file

@ -129,30 +129,24 @@ UM.ManagementPage
enabled: base.currentItem != null && base.currentItem.id != Cura.MachineManager.activeMaterialId
onClicked: Cura.MachineManager.setActiveMaterial(base.currentItem.id)
},
/* // apparently visible does not work on OS X
Button
// apparently visible does not work on OS X
/*Button
{
text: catalog.i18nc("@action:button", "Duplicate");
iconName: "list-add";
enabled: base.currentItem != null
onClicked:
{
var material_id = Cura.ContainerManager.duplicateContainer(base.currentItem.id)
var base_file = Cura.ContainerManager.getContainerMetaDataEntry(base.currentItem.id, "base_file")
// We need to copy the base container instead of the specific variant.
var material_id = base_file == "" ? Cura.ContainerManager.duplicateMaterial(base.currentItem.id): Cura.ContainerManager.duplicateMaterial(base_file)
if(material_id == "")
{
return
}
if(Cura.MachineManager.filterQualityByMachine)
{
var quality_id = Cura.ContainerManager.duplicateContainer(Cura.MachineManager.activeQualityId)
Cura.ContainerManager.setContainerMetaDataEntry(quality_id, "material", material_id)
Cura.MachineManager.setActiveQuality(quality_id)
}
Cura.MachineManager.setActiveMaterial(material_id)
}
visible: false;
},
*/
Button

View file

@ -84,7 +84,7 @@ UM.ManagementPage
onClicked:
{
newNameDialog.object = base.currentItem != null ? base.currentItem.name : "";
newNameDialog.object = base.currentItem != null ? Cura.ContainerManager.makeUniqueName(base.currentItem.name) : "";
newNameDialog.open();
newNameDialog.selectText();
}
@ -100,7 +100,7 @@ UM.ManagementPage
onClicked:
{
newDuplicateNameDialog.object = base.currentItem.name;
newDuplicateNameDialog.object = Cura.ContainerManager.makeUniqueName(base.currentItem.name);
newDuplicateNameDialog.open();
newDuplicateNameDialog.selectText();
}
@ -141,11 +141,12 @@ UM.ManagementPage
scrollviewCaption: catalog.i18nc("@label %1 is printer name","Printer: %1").arg(Cura.MachineManager.activeMachineName)
signal showProfileNameDialog()
onShowProfileNameDialog:
signal createProfile()
onCreateProfile:
{
renameDialog.open();
renameDialog.selectText();
newNameDialog.object = base.currentItem != null ? Cura.ContainerManager.makeUniqueName(base.currentItem.name) : "";
newNameDialog.open();
newNameDialog.selectText();
}
signal selectContainer(string name)
@ -267,6 +268,7 @@ UM.ManagementPage
UM.RenameDialog
{
title: catalog.i18nc("@title:window", "Rename Profile")
id: renameDialog;
object: base.currentItem != null ? base.currentItem.name : ""
onAccepted:
@ -279,6 +281,7 @@ UM.ManagementPage
// Dialog to request a name when creating a new profile
UM.RenameDialog
{
title: catalog.i18nc("@title:window", "Create Profile")
id: newNameDialog;
object: "<new name>";
onAccepted:
@ -292,6 +295,7 @@ UM.ManagementPage
// Dialog to request a name when duplicating a new profile
UM.RenameDialog
{
title: catalog.i18nc("@title:window", "Duplicate Profile")
id: newDuplicateNameDialog;
object: "<new name>";
onAccepted:

View file

@ -138,7 +138,7 @@ Item {
{
id: linkedSettingIcon;
visible: Cura.MachineManager.activeStackId != Cura.MachineManager.activeMachineId && !definition.settable_per_extruder && base.showLinkedSettingIcon
visible: Cura.MachineManager.activeStackId != Cura.MachineManager.activeMachineId && (!definition.settable_per_extruder || definition.global_inherits_stack != "-1") && base.showLinkedSettingIcon
height: parent.height;
width: height;

View file

@ -40,7 +40,7 @@ ScrollView
id: delegate
width: UM.Theme.getSize("sidebar").width;
height: provider.properties.enabled == "True" ? UM.Theme.getSize("section").height : 0
height: provider.properties.enabled == "True" ? UM.Theme.getSize("section").height : - contents.spacing
Behavior on height { NumberAnimation { duration: 100 } }
opacity: provider.properties.enabled == "True" ? 1 : 0
Behavior on opacity { NumberAnimation { duration: 100 } }

View file

@ -199,18 +199,32 @@ QtObject {
property Component progressbar: Component{
ProgressBarStyle {
background:Rectangle {
background: Rectangle {
implicitWidth: Theme.getSize("message").width - (Theme.getSize("default_margin").width * 2)
implicitHeight: Theme.getSize("progressbar").height
radius: Theme.getSize("progressbar_radius").width
color: Theme.getColor("progressbar_background")
color: control.hasOwnProperty("backgroundColor") ? control.backgroundColor : Theme.getColor("progressbar_background")
}
progress: Rectangle {
color: control.indeterminate ? "transparent" : Theme.getColor("progressbar_control")
color:
{
if(control.indeterminate)
{
return "transparent";
}
else if(control.hasOwnProperty("controlColor"))
{
return control.controlColor;
}
else
{
return Theme.getColor("progressbar_control");
}
}
radius: Theme.getSize("progressbar_radius").width
Rectangle{
radius: Theme.getSize("progressbar_radius").width
color: Theme.getColor("progressbar_control")
color: control.hasOwnProperty("controlColor") ? control.controlColor : Theme.getColor("progressbar_control")
width: Theme.getSize("progressbar_control").width
height: Theme.getSize("progressbar_control").height
visible: control.indeterminate

View file

@ -159,9 +159,17 @@
"tooltip": [12, 169, 227, 255],
"tooltip_text": [255, 255, 255, 255],
"message_background": [255, 255, 255, 255],
"message_text": [32, 166, 219, 255],
"message_dismiss": [127, 127, 127, 255],
"message_background": [24, 41, 77, 255],
"message_text": [255, 255, 255, 255],
"message_border": [24, 41, 77, 255],
"message_button": [255, 255, 255, 255],
"message_button_hover": [12, 169, 227, 255],
"message_button_active": [32, 166, 219, 255],
"message_button_text": [24, 41, 77, 255],
"message_button_text_hover": [255, 255, 255, 255],
"message_button_text_active": [255, 255, 255, 255],
"message_progressbar_background": [255, 255, 255, 255],
"message_progressbar_control": [12, 169, 227, 255],
"tool_panel_background": [255, 255, 255, 255],