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

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
Show Stats 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 return False
extruder_stack = global_stack.extruders[extruder_position] extruder_stack = global_stack.extruders[extruder_position]
available_materials = self._material_manager.getAvailableMaterialsForMachineExtruder(global_stack, extruder_stack) self._available_materials = self._material_manager.getAvailableMaterialsForMachineExtruder(global_stack, extruder_stack)
if available_materials == self._available_materials:
return False
self._available_materials = available_materials
if self._available_materials is None: if self._available_materials is None:
return False return False

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

@ -1,5 +1,5 @@
// Copyright (c) 2018 Ultimaker B.V. // 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 2.7
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
@ -69,11 +69,7 @@ Rectangle
} }
style: ButtonStyle style: ButtonStyle
{ {
background: Rectangle background: Item { }
{
anchors.fill: parent
color: "transparent"
}
} }
} }
} }

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

@ -1,5 +1,5 @@
// Copyright (c) 2018 Ultimaker B.V. // 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 2.7
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
@ -70,7 +70,8 @@ Rectangle
} }
onClicked: onClicked:
{ {
if (materialSlot.is_favorite) { if (materialSlot.is_favorite)
{
base.materialManager.removeFavorite(material.root_material_id) base.materialManager.removeFavorite(material.root_material_id)
materialSlot.is_favorite = false materialSlot.is_favorite = false
return return
@ -81,13 +82,10 @@ Rectangle
} }
style: ButtonStyle style: ButtonStyle
{ {
background: Rectangle background: Item { }
{
anchors.fill: parent
color: "transparent"
}
} }
UM.RecolorImage { UM.RecolorImage
{
anchors anchors
{ {
verticalCenter: favorite_button.verticalCenter verticalCenter: favorite_button.verticalCenter