GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-04 11:14:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.6'

Browse Source
This commit is contained in:
Ghostkeeper 2018-10-30 10:39:44 +01:00
commit cc8776a9b0
No known key found for this signature in database
GPG Key ID: 86BEF881AE2CF276
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
View File

@ -407,14 +407,9 @@ Item {
function updateFilter() function updateFilter()
{ {
var new_filter = {}; var new_filter = {};
if (printSequencePropertyProvider.properties.value == "one_at_a_time") new_filter["settable_per_mesh"] = true;
{ // Don't filter on "settable_per_meshgroup" any more when `printSequencePropertyProvider.properties.value`
new_filter["settable_per_meshgroup"] = true; // is set to "one_at_a_time", because the current backend architecture isn't ready for that.
}
else
{
new_filter["settable_per_mesh"] = true;
}
if(filterInput.text != "") if(filterInput.text != "")
{ {

13
plugins/Toolbox/resources/qml/ToolboxDetailPage.qml
View File

@ -25,14 +25,11 @@ Item
rightMargin: UM.Theme.getSize("wide_margin").width rightMargin: UM.Theme.getSize("wide_margin").width
} }
height: UM.Theme.getSize("toolbox_detail_header").height height: UM.Theme.getSize("toolbox_detail_header").height
Image Rectangle
{ {
id: thumbnail id: thumbnail
width: UM.Theme.getSize("toolbox_thumbnail_medium").width width: UM.Theme.getSize("toolbox_thumbnail_medium").width
height: UM.Theme.getSize("toolbox_thumbnail_medium").height height: UM.Theme.getSize("toolbox_thumbnail_medium").height
fillMode: Image.PreserveAspectFit
source: details === null ? "" : (details.icon_url || "../images/logobot.svg")
mipmap: true
anchors anchors
{ {
top: parent.top top: parent.top
@ -40,6 +37,14 @@ Item
leftMargin: UM.Theme.getSize("wide_margin").width leftMargin: UM.Theme.getSize("wide_margin").width
topMargin: UM.Theme.getSize("wide_margin").height topMargin: UM.Theme.getSize("wide_margin").height
} }
color: white //Always a white background for image (regardless of theme).
Image
{
anchors.fill: parent
fillMode: Image.PreserveAspectFit
source: details === null ? "" : (details.icon_url || "../images/logobot.svg")
mipmap: true
}
} }
Label Label