Remove all the signal propagation for the tooltip and allow only Cura.qml to handle them

Contributes to CURA-5941.
This commit is contained in:
Diego Prado Gesto 2018-12-02 20:32:55 +01:00
parent adabb833e0
commit 7dc3320b06
11 changed files with 28 additions and 54 deletions

View file

@ -32,7 +32,7 @@ Item
Item
{
id: enableAdhesionContainer
height: childrenRect.height
height: enableAdhesionCheckBox.height
anchors
{
@ -46,9 +46,11 @@ Item
id: enableAdhesionCheckBox
anchors.verticalCenter: parent.verticalCenter
property alias _hovered: adhesionMouseArea.containsMouse
//: Setting enable printing build-plate adhesion helper checkbox
style: UM.Theme.styles.checkbox
enabled: base.settingsEnabled
enabled: recommendedPrintSettup.settingsEnabled
visible: platformAdhesionType.properties.enabled == "True"
checked: platformAdhesionType.properties.value != "skirt" && platformAdhesionType.properties.value != "none"
@ -58,7 +60,6 @@ Item
id: adhesionMouseArea
anchors.fill: parent
hoverEnabled: true
enabled: base.settingsEnabled
onClicked:
{

View file

@ -189,7 +189,7 @@ Item
text: catalog.i18nc("@label", "Gradual infill")
style: UM.Theme.styles.checkbox
enabled: base.settingsEnabled
enabled: recommendedPrintSettup.settingsEnabled
visible: infillSteps.properties.enabled == "True"
checked: parseInt(infillSteps.properties.value) > 0

View file

@ -10,13 +10,10 @@ import Cura 1.0 as Cura
Item
{
id: base
id: recommendedPrintSettup
height: childrenRect.height + 2 * padding
signal showTooltip(Item item, point location, string text)
signal hideTooltip()
property Action configureSettings
property bool settingsEnabled: Cura.ExtruderManager.activeExtruderStackId || extrudersEnabledCount.properties.value == 1

View file

@ -50,7 +50,7 @@ Item
property alias _hovered: enableSupportMouseArea.containsMouse
style: UM.Theme.styles.checkbox
enabled: base.settingsEnabled
enabled: recommendedPrintSettup.settingsEnabled
visible: supportEnabled.properties.enabled == "True"
checked: supportEnabled.properties.value == "True"
@ -60,6 +60,7 @@ Item
id: enableSupportMouseArea
anchors.fill: parent
hoverEnabled: true
onClicked: supportEnabled.setPropertyValue("value", supportEnabled.properties.value != "True")
onEntered:
@ -86,7 +87,7 @@ Item
}
style: UM.Theme.styles.combobox_color
enabled: base.settingsEnabled
enabled: recommendedPrintSettup.settingsEnabled
visible: enableSupportCheckBox.visible && (supportEnabled.properties.value == "True") && (extrudersEnabledCount.properties.value > 1)
textRole: "text" // this solves that the combobox isn't populated in the first time Cura is started
@ -126,7 +127,7 @@ Item
id: supportExtruderMouseArea
anchors.fill: parent
hoverEnabled: true
enabled: base.settingsEnabled
enabled: recommendedPrintSettup.settingsEnabled
acceptedButtons: Qt.NoButton
onEntered:
{