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

Merge remote-tracking branch 'origin/3.4'

Browse source
This commit is contained in:
Lipu Fei 2018-05-31 12:25:33 +02:00
commit 7d8472e588
4 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/Toolbox/resources/qml/ToolboxDownloadsPage.qml
View file

@ -18,6 +18,8 @@ ScrollView
spacing: UM.Theme.getSize("default_margin").height
padding: UM.Theme.getSize("wide_margin").height
height: childrenRect.height + 2 * padding
/* Hide for 3.4
ToolboxDownloadsShowcase
{
id: showcase
@ -29,6 +31,8 @@ ScrollView
width: parent.width
height: UM.Theme.getSize("default_lining").height
}
*/
ToolboxDownloadsGrid
{
id: allPlugins

3
plugins/Toolbox/resources/qml/ToolboxHeader.qml
View file

@ -33,6 +33,8 @@ Item
toolbox.viewPage = "overview"
}
}
/* Hide for 3.4
ToolboxTabButton
{
text: catalog.i18nc("@title:tab", "Materials")
@ -45,6 +47,7 @@ Item
toolbox.viewPage = "overview"
}
}
*/
}
ToolboxTabButton
{

2
plugins/Toolbox/resources/qml/ToolboxProgressButton.qml
View file

@ -150,7 +150,7 @@ Item
{
id: loader
visible: active
source: "../images/loading.gif"
source: visible ? "../images/loading.gif" : ""
width: UM.Theme.getSize("toolbox_loader").width
height: UM.Theme.getSize("toolbox_loader").height
anchors.right: button.left

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

@ -5835,7 +5835,7 @@
"description": "The file location of an image of which the brightness values determine the minimal density at the corresponding location in the support.",
"type": "str",
"default_value": "",
"enabled": "infill_pattern == 'cross' or infill_pattern == 'cross_3d'",
"enabled": "support_pattern == 'cross' or support_pattern == 'cross_3d'",
"limit_to_extruder": "support_infill_extruder_nr",
"settable_per_mesh": false,
"settable_per_extruder": true