3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-08 14:34:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merge branch '4.0' into STAR-322_cloud-connection

Browse source
This commit is contained in:
ChrisTerBeke 2018-12-18 17:43:28 +01:00
commit b66047c7d1
3 changed files with 9 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

5
cura/Machines/Models/BaseMaterialsModel.py
View file

@ -106,10 +106,7 @@ class BaseMaterialsModel(ListModel):
return False
extruder_stack = global_stack.extruders[extruder_position]
available_materials = self._material_manager.getAvailableMaterialsForMachineExtruder(global_stack, extruder_stack)
if available_materials == self._available_materials:
return False
self._available_materials = available_materials
self._available_materials = self._material_manager.getAvailableMaterialsForMachineExtruder(global_stack, extruder_stack)
if self._available_materials is None:
return False

8
resources/qml/Preferences/Materials/MaterialsBrandSection.qml
View file

@ -1,5 +1,5 @@
// Copyright (c) 2018 Ultimaker B.V.
// Uranium is released under the terms of the LGPLv3 or higher.
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.7
import QtQuick.Controls 1.4
@ -69,11 +69,7 @@ Rectangle
}
style: ButtonStyle
{
background: Rectangle
{
anchors.fill: parent
color: "transparent"
}
background: Item { }
}
}
}

14
resources/qml/Preferences/Materials/MaterialsSlot.qml
View file

@ -1,5 +1,5 @@
// Copyright (c) 2018 Ultimaker B.V.
// Uranium is released under the terms of the LGPLv3 or higher.
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.7
import QtQuick.Controls 1.4
@ -70,7 +70,8 @@ Rectangle
}
onClicked:
{
if (materialSlot.is_favorite) {
if (materialSlot.is_favorite)
{
base.materialManager.removeFavorite(material.root_material_id)
materialSlot.is_favorite = false
return
@ -81,13 +82,10 @@ Rectangle
}
style: ButtonStyle
{
background: Rectangle
{
anchors.fill: parent
color: "transparent"
}
background: Item { }
}
UM.RecolorImage {
UM.RecolorImage
{
anchors
{
verticalCenter: favorite_button.verticalCenter