From f650579799d3e7cae5944a3d9cb0191259a52dd6 Mon Sep 17 00:00:00 2001 From: "j.delarago" Date: Fri, 17 Jun 2022 15:02:45 +0200 Subject: PrintQuality icon is slightly too right aligned due to the icon not filling the entire svg. There is no additional margin on the left that can be removed, so instead I've given it a small negative margin CURA-8849 --- .../qml/PrintSetupSelector/Recommended/RecommendedResolutionSelector.qml | 1 + 1 file changed, 1 insertion(+) (limited to 'resources') diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedResolutionSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedResolutionSelector.qml index bbad686514..4f1b49e931 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedResolutionSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedResolutionSelector.qml @@ -22,6 +22,7 @@ Item id: resolutionTitle anchors.top: parent.top anchors.left: parent.left + anchors.leftMargin: - UM.Theme.getSize("thick_lining").width source: UM.Theme.getIcon("PrintQuality") text: catalog.i18nc("@label", "Resolution") width: labelColumnWidth -- cgit v1.2.3 From c6bc3a5cd72e731b9e1393b7247166ff2171bbbb Mon Sep 17 00:00:00 2001 From: "j.delarago" Date: Mon, 20 Jun 2022 10:52:31 +0200 Subject: Add tooltip to IconWithText.qml, Use this to display tooltips for Infill, Support and Adhesion in recommended settings. CURA-8849 --- resources/qml/IconWithText.qml | 11 +++++++++++ .../Recommended/RecommendedAdhesionSelector.qml | 1 + .../Recommended/RecommendedInfillDensitySelector.qml | 1 + .../Recommended/RecommendedSupportSelector.qml | 1 + 4 files changed, 14 insertions(+) (limited to 'resources') diff --git a/resources/qml/IconWithText.qml b/resources/qml/IconWithText.qml index 24f211ae17..dd3dea7c25 100644 --- a/resources/qml/IconWithText.qml +++ b/resources/qml/IconWithText.qml @@ -24,6 +24,8 @@ Item property alias wrapMode: label.wrapMode property real spacing: UM.Theme.getSize("narrow_margin").width + property string tooltipText + // These properties can be used in combination with layouts. readonly property real contentWidth: icon.width + margin + label.contentWidth readonly property real minContentWidth: Math.round(icon.width + margin + 0.5 * label.contentWidth) @@ -66,4 +68,13 @@ Item margins: margin } } + + MouseArea + { + enabled: tooltipText != null + anchors.fill: parent + hoverEnabled: true + onEntered: base.showTooltip(parent, Qt.point(-UM.Theme.getSize("thick_margin").width, 0), tooltipText) + onExited: base.hideTooltip() + } } \ No newline at end of file diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml index 74c496f824..4333288e5a 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml @@ -28,6 +28,7 @@ Item font: UM.Theme.getFont("medium") width: labelColumnWidth iconSize: UM.Theme.getSize("medium_button_icon").width + tooltipText: catalog.i18nc("@label", "Enable printing a brim or raft. This will add a flat area around or under your object which is easy to cut off afterwards.") } Item diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml index 9e2d73609c..7cf7da00a6 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml @@ -65,6 +65,7 @@ Item font: UM.Theme.getFont("medium") width: labelColumnWidth iconSize: UM.Theme.getSize("medium_button_icon").width + tooltipText: catalog.i18nc("@label", "Gradual infill will gradually increase the amount of infill towards the top.") } Item diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml index 0b683f0ddf..fe0caa5050 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml @@ -29,6 +29,7 @@ Item font: UM.Theme.getFont("medium") width: labelColumnWidth iconSize: UM.Theme.getSize("medium_button_icon").width + tooltipText: catalog.i18nc("@label", "Generate structures to support parts of the model which have overhangs. Without these structures, such parts would collapse during printing.") } Item -- cgit v1.2.3 From 9c16e200e09ec1e17216acedd6005ad95df4e0b7 Mon Sep 17 00:00:00 2001 From: "j.delarago" Date: Mon, 20 Jun 2022 10:56:00 +0200 Subject: Update reset settings icon in print settings to match new color used in recommeded settings CURA-8849 --- resources/qml/Settings/SettingItem.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'resources') diff --git a/resources/qml/Settings/SettingItem.qml b/resources/qml/Settings/SettingItem.qml index 228de4a9d6..53f194dfd2 100644 --- a/resources/qml/Settings/SettingItem.qml +++ b/resources/qml/Settings/SettingItem.qml @@ -209,7 +209,7 @@ Item height: UM.Theme.getSize("small_button_icon").height width: height - color: UM.Theme.getColor("setting_control_button") + color: UM.Theme.getColor("accent_1") hoverColor: UM.Theme.getColor("setting_control_button_hover") iconSource: UM.Theme.getIcon("ArrowReset") -- cgit v1.2.3 From 4ee4a781f40225b49323f0a417c688fc736adbb1 Mon Sep 17 00:00:00 2001 From: "j.delarago" Date: Mon, 20 Jun 2022 11:33:28 +0200 Subject: Change flashing yellow warning on resolution combobox to blue flashing lining. Removed alwaysRunToEnd on animation since we would like the previous animation to stop if a user clicks through multiple intents triggering multiple animations. CURA-8849 --- resources/qml/Widgets/ComboBox.qml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'resources') diff --git a/resources/qml/Widgets/ComboBox.qml b/resources/qml/Widgets/ComboBox.qml index 77e6c489e9..eac85bfb44 100644 --- a/resources/qml/Widgets/ComboBox.qml +++ b/resources/qml/Widgets/ComboBox.qml @@ -56,28 +56,30 @@ ComboBox background: UM.UnderlineBackground { - //Rectangle for highlighting when this combobox needs to pulse. + // Rectangle for highlighting when this combobox needs to pulse. Rectangle { anchors.fill: parent opacity: 0 - color: UM.Theme.getColor("warning") + color: "transparent" + + border.color: UM.Theme.getColor("text_field_border_active") + border.width: UM.Theme.getSize("default_lining").width SequentialAnimation on opacity { id: pulseAnimation running: false - loops: 1 - alwaysRunToEnd: true + loops: 2 PropertyAnimation { to: 1 - duration: 300 + duration: 150 } PropertyAnimation { to: 0 - duration : 2000 + duration : 150 } } } -- cgit v1.2.3 From cde897ff1eb4395f0b3132e05366c94f76bd5c7b Mon Sep 17 00:00:00 2001 From: "j.delarago" Date: Tue, 21 Jun 2022 11:59:03 +0200 Subject: Instead of having a seperate tooltip for the checkbox and the text area, the two have been combined into one tooltip. The reason for this is that hovering the mouse between the checkbox and text was causing some strange behaviour where sometimes the tooltip would not appear. The effect of the changes in RecommendedSupportSelector.qml are the same as RecommendedAdhesionSelector.qml. It just required a bit of refactoring to have the checkbox and the textlabel in the same component. CURA-8849 --- .../Recommended/RecommendedAdhesionSelector.qml | 30 +- .../Recommended/RecommendedSupportSelector.qml | 378 +++++++++++---------- 2 files changed, 208 insertions(+), 200 deletions(-) (limited to 'resources') diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml index 4333288e5a..b69587102e 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml @@ -28,7 +28,6 @@ Item font: UM.Theme.getFont("medium") width: labelColumnWidth iconSize: UM.Theme.getSize("medium_button_icon").width - tooltipText: catalog.i18nc("@label", "Enable printing a brim or raft. This will add a flat area around or under your object which is easy to cut off afterwards.") } Item @@ -48,8 +47,6 @@ Item id: enableAdhesionCheckBox anchors.verticalCenter: parent.verticalCenter - property alias _hovered: adhesionMouseArea.containsMouse - //: Setting enable printing build-plate adhesion helper checkbox enabled: recommendedPrintSetup.settingsEnabled @@ -61,22 +58,25 @@ Item id: adhesionMouseArea anchors.fill: parent hoverEnabled: true - - onClicked: - { - curaRecommendedMode.setAdhesion(!parent.checked) - } - - onEntered: - { - base.showTooltip(enableAdhesionCheckBox, Qt.point(-enableAdhesionContainer.x - UM.Theme.getSize("thick_margin").width, 0), - catalog.i18nc("@label", "Enable printing a brim or raft. This will add a flat area around or under your object which is easy to cut off afterwards.")); - } - onExited: base.hideTooltip() + // propagateComposedEvents used on adhesionTooltipMouseArea does not work with Controls Components. + // It only works with other MouseAreas, so this is required + onClicked: curaRecommendedMode.setAdhesion(!parent.checked) } } } + MouseArea + { + id: adhesionTooltipMouseArea + anchors.fill: parent + propagateComposedEvents: true + hoverEnabled: true + + onEntered:base.showTooltip(enableAdhesionCheckBox, Qt.point(-enableAdhesionContainer.x - UM.Theme.getSize("thick_margin").width, 0), + catalog.i18nc("@label", "Enable printing a brim or raft. This will add a flat area around or under your object which is easy to cut off afterwards.")); + onExited: base.hideTooltip() + } + UM.SettingPropertyProvider { id: platformAdhesionType diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml index fe0caa5050..fc56c7cfd7 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml @@ -18,36 +18,39 @@ Item property real labelColumnWidth: Math.round(width / 3) - Cura.IconWithText - { - id: enableSupportRowTitle - anchors.top: parent.top - anchors.left: parent.left - visible: enableSupportCheckBox.visible - source: UM.Theme.getIcon("Support") - text: catalog.i18nc("@label", "Support") - font: UM.Theme.getFont("medium") - width: labelColumnWidth - iconSize: UM.Theme.getSize("medium_button_icon").width - tooltipText: catalog.i18nc("@label", "Generate structures to support parts of the model which have overhangs. Without these structures, such parts would collapse during printing.") - } - Item { id: enableSupportContainer - height: enableSupportCheckBox.height + height: enableSupportCheckBox + width: childrenRect.width anchors { - left: enableSupportRowTitle.right - right: parent.right - verticalCenter: enableSupportRowTitle.verticalCenter + left: parent.left + top: parent.top + bottom: parent.bottom + rightMargin: UM.Theme.getSize("thick_margin").width + verticalCenter: parent.verticalCenter + } + + Cura.IconWithText + { + id: enableSupportRowTitle + anchors.left: parent.left + visible: enableSupportCheckBox.visible + source: UM.Theme.getIcon("Support") + text: catalog.i18nc("@label", "Support") + font: UM.Theme.getFont("medium") + width: labelColumnWidth + iconSize: UM.Theme.getSize("medium_button_icon").width + tooltipText: catalog.i18nc("@label", "Generate structures to support parts of the model which have overhangs. Without these structures, such parts would collapse during printing.") } UM.CheckBox { id: enableSupportCheckBox anchors.verticalCenter: parent.verticalCenter + anchors.left: enableSupportRowTitle.right property alias _hovered: enableSupportMouseArea.containsMouse @@ -61,157 +64,219 @@ Item id: enableSupportMouseArea anchors.fill: parent hoverEnabled: true - + // propagateComposedEvents used on supportToolTipMouseArea does not work with Controls Components. + // It only works with other MouseAreas, so this is required onClicked: supportEnabled.setPropertyValue("value", supportEnabled.properties.value != "True") - - onEntered: - { - base.showTooltip(enableSupportCheckBox, Qt.point(-enableSupportContainer.x - UM.Theme.getSize("thick_margin").width, 0), - catalog.i18nc("@label", "Generate structures to support parts of the model which have overhangs. Without these structures, such parts would collapse during printing.")) - } - onExited: base.hideTooltip() } } - ComboBox + MouseArea { - id: supportExtruderCombobox + id: supportToolTipMouseArea + anchors.fill: parent + propagateComposedEvents: true + hoverEnabled: true + onEntered: base.showTooltip(enableSupportContainer, Qt.point(-enableSupportContainer.x - UM.Theme.getSize("thick_margin").width, 0), + catalog.i18nc("@label", "Generate structures to support parts of the model which have overhangs. Without these structures, such parts would collapse during printing.")) + onExited: base.hideTooltip() + } + } - height: UM.Theme.getSize("print_setup_big_item").height - anchors - { - left: enableSupportCheckBox.right - right: parent.right - leftMargin: UM.Theme.getSize("thick_margin").width - rightMargin: UM.Theme.getSize("thick_margin").width - verticalCenter: parent.verticalCenter - } + ComboBox + { + id: supportExtruderCombobox - enabled: recommendedPrintSetup.settingsEnabled - visible: enableSupportCheckBox.visible && (supportEnabled.properties.value == "True") && (extrudersEnabledCount.properties.value > 1) - textRole: "name" // this solves that the combobox isn't populated in the first time Cura is started + height: UM.Theme.getSize("print_setup_big_item").height + anchors + { + left: enableSupportContainer.right + right: parent.right + leftMargin: UM.Theme.getSize("default_margin").width + rightMargin: UM.Theme.getSize("thick_margin").width + verticalCenter: parent.verticalCenter + } + + enabled: recommendedPrintSetup.settingsEnabled + visible: enableSupportCheckBox.visible && (supportEnabled.properties.value == "True") && (extrudersEnabledCount.properties.value > 1) + textRole: "name" // this solves that the combobox isn't populated in the first time Cura is started - model: extruderModel + model: extruderModel - // knowing the extruder position, try to find the item index in the model - function getIndexByPosition(position) + // knowing the extruder position, try to find the item index in the model + function getIndexByPosition(position) + { + var itemIndex = -1 // if position is not found, return -1 + for (var item_index in model.items) { - var itemIndex = -1 // if position is not found, return -1 - for (var item_index in model.items) + var item = model.getItem(item_index) + if (item.index == position) { - var item = model.getItem(item_index) - if (item.index == position) - { - itemIndex = item_index - break - } + itemIndex = item_index + break } - return itemIndex } + return itemIndex + } + + onActivated: + { + if (model.getItem(index).enabled) + { + forceActiveFocus(); + supportExtruderNr.setPropertyValue("value", model.getItem(index).index); + } else + { + currentIndex = supportExtruderNr.properties.value; // keep the old value + } + } + + currentIndex: (supportExtruderNr.properties.value !== undefined) ? supportExtruderNr.properties.value : 0 - onActivated: + property string color: "#fff" + Connections + { + target: extruderModel + function onModelChanged() { - if (model.getItem(index).enabled) - { - forceActiveFocus(); - supportExtruderNr.setPropertyValue("value", model.getItem(index).index); - } else + var maybeColor = supportExtruderCombobox.model.getItem(supportExtruderCombobox.currentIndex).color + if (maybeColor) { - currentIndex = supportExtruderNr.properties.value; // keep the old value + supportExtruderCombobox.color = maybeColor } } + } + onCurrentIndexChanged: + { + var maybeColor = supportExtruderCombobox.model.getItem(supportExtruderCombobox.currentIndex).color + if(maybeColor) + { + supportExtruderCombobox.color = maybeColor + } + } + + Binding + { + target: supportExtruderCombobox + property: "currentIndex" + value: supportExtruderCombobox.getIndexByPosition(supportExtruderNr.properties.value) + // Sometimes when the value is already changed, the model is still being built. + // The when clause ensures that the current index is not updated when this happens. + when: supportExtruderCombobox.model.count > 0 + } + + indicator: UM.ColorImage + { + id: downArrow + x: supportExtruderCombobox.width - width - supportExtruderCombobox.rightPadding + y: supportExtruderCombobox.topPadding + Math.round((supportExtruderCombobox.availableHeight - height) / 2) + + source: UM.Theme.getIcon("ChevronSingleDown") + width: UM.Theme.getSize("standard_arrow").width + height: UM.Theme.getSize("standard_arrow").height - currentIndex: (supportExtruderNr.properties.value !== undefined) ? supportExtruderNr.properties.value : 0 + color: UM.Theme.getColor("setting_control_button") + } - property string color: "#fff" - Connections + background: Rectangle + { + color: { - target: extruderModel - function onModelChanged() + if (!enabled) + { + return UM.Theme.getColor("setting_control_disabled") + } + if (supportExtruderCombobox.hovered || base.activeFocus) { - var maybeColor = supportExtruderCombobox.model.getItem(supportExtruderCombobox.currentIndex).color - if (maybeColor) - { - supportExtruderCombobox.color = maybeColor - } + return UM.Theme.getColor("setting_control_highlight") } + return UM.Theme.getColor("setting_control") } - onCurrentIndexChanged: + radius: UM.Theme.getSize("setting_control_radius").width + border.width: UM.Theme.getSize("default_lining").width + border.color: { - var maybeColor = supportExtruderCombobox.model.getItem(supportExtruderCombobox.currentIndex).color - if(maybeColor) + if (!enabled) { - supportExtruderCombobox.color = maybeColor + return UM.Theme.getColor("setting_control_disabled_border") + } + if (supportExtruderCombobox.hovered || supportExtruderCombobox.activeFocus) + { + return UM.Theme.getColor("setting_control_border_highlight") } + return UM.Theme.getColor("setting_control_border") } + } - Binding + contentItem: UM.Label + { + anchors.verticalCenter: parent.verticalCenter + anchors.left: parent.left + anchors.leftMargin: UM.Theme.getSize("setting_unit_margin").width + anchors.right: downArrow.left + rightPadding: swatch.width + UM.Theme.getSize("setting_unit_margin").width + + text: supportExtruderCombobox.currentText + textFormat: Text.PlainText + color: enabled ? UM.Theme.getColor("setting_control_text") : UM.Theme.getColor("setting_control_disabled_text") + + elide: Text.ElideLeft + + + background: Rectangle { - target: supportExtruderCombobox - property: "currentIndex" - value: supportExtruderCombobox.getIndexByPosition(supportExtruderNr.properties.value) - // Sometimes when the value is already changed, the model is still being built. - // The when clause ensures that the current index is not updated when this happens. - when: supportExtruderCombobox.model.count > 0 + id: swatch + height: Math.round(parent.height / 2) + width: height + radius: Math.round(width / 2) + anchors.right: parent.right + anchors.verticalCenter: parent.verticalCenter + anchors.rightMargin: UM.Theme.getSize("thin_margin").width + + color: supportExtruderCombobox.color } + } - indicator: UM.ColorImage - { - id: downArrow - x: supportExtruderCombobox.width - width - supportExtruderCombobox.rightPadding - y: supportExtruderCombobox.topPadding + Math.round((supportExtruderCombobox.availableHeight - height) / 2) + popup: Popup + { + y: supportExtruderCombobox.height - UM.Theme.getSize("default_lining").height + width: supportExtruderCombobox.width + implicitHeight: contentItem.implicitHeight + 2 * UM.Theme.getSize("default_lining").width + padding: UM.Theme.getSize("default_lining").width - source: UM.Theme.getIcon("ChevronSingleDown") - width: UM.Theme.getSize("standard_arrow").width - height: UM.Theme.getSize("standard_arrow").height + contentItem: ListView + { + implicitHeight: contentHeight - color: UM.Theme.getColor("setting_control_button") + ScrollBar.vertical: UM.ScrollBar {} + clip: true + model: supportExtruderCombobox.popup.visible ? supportExtruderCombobox.delegateModel : null + currentIndex: supportExtruderCombobox.highlightedIndex } background: Rectangle { - color: - { - if (!enabled) - { - return UM.Theme.getColor("setting_control_disabled") - } - if (supportExtruderCombobox.hovered || base.activeFocus) - { - return UM.Theme.getColor("setting_control_highlight") - } - return UM.Theme.getColor("setting_control") - } - radius: UM.Theme.getSize("setting_control_radius").width - border.width: UM.Theme.getSize("default_lining").width - border.color: - { - if (!enabled) - { - return UM.Theme.getColor("setting_control_disabled_border") - } - if (supportExtruderCombobox.hovered || supportExtruderCombobox.activeFocus) - { - return UM.Theme.getColor("setting_control_border_highlight") - } - return UM.Theme.getColor("setting_control_border") - } + color: UM.Theme.getColor("setting_control") + border.color: UM.Theme.getColor("setting_control_border") } + } + + delegate: ItemDelegate + { + width: supportExtruderCombobox.width - 2 * UM.Theme.getSize("default_lining").width + height: supportExtruderCombobox.height + highlighted: supportExtruderCombobox.highlightedIndex == index contentItem: UM.Label { - anchors.verticalCenter: parent.verticalCenter - anchors.left: parent.left + anchors.fill: parent anchors.leftMargin: UM.Theme.getSize("setting_unit_margin").width - anchors.right: downArrow.left - rightPadding: swatch.width + UM.Theme.getSize("setting_unit_margin").width + anchors.rightMargin: UM.Theme.getSize("setting_unit_margin").width - text: supportExtruderCombobox.currentText - textFormat: Text.PlainText - color: enabled ? UM.Theme.getColor("setting_control_text") : UM.Theme.getColor("setting_control_disabled_text") - - elide: Text.ElideLeft + text: model.name + color: model.enabled ? UM.Theme.getColor("setting_control_text"): UM.Theme.getColor("action_button_disabled_text") + elide: Text.ElideRight + rightPadding: swatch.width + UM.Theme.getSize("setting_unit_margin").width background: Rectangle { @@ -223,71 +288,14 @@ Item anchors.verticalCenter: parent.verticalCenter anchors.rightMargin: UM.Theme.getSize("thin_margin").width - color: supportExtruderCombobox.color - } - } - - popup: Popup - { - y: supportExtruderCombobox.height - UM.Theme.getSize("default_lining").height - width: supportExtruderCombobox.width - implicitHeight: contentItem.implicitHeight + 2 * UM.Theme.getSize("default_lining").width - padding: UM.Theme.getSize("default_lining").width - - contentItem: ListView - { - implicitHeight: contentHeight - - ScrollBar.vertical: UM.ScrollBar {} - clip: true - model: supportExtruderCombobox.popup.visible ? supportExtruderCombobox.delegateModel : null - currentIndex: supportExtruderCombobox.highlightedIndex - } - - background: Rectangle - { - color: UM.Theme.getColor("setting_control") - border.color: UM.Theme.getColor("setting_control_border") + color: supportExtruderCombobox.model.getItem(index).color } } - delegate: ItemDelegate + background: Rectangle { - width: supportExtruderCombobox.width - 2 * UM.Theme.getSize("default_lining").width - height: supportExtruderCombobox.height - highlighted: supportExtruderCombobox.highlightedIndex == index - - contentItem: UM.Label - { - anchors.fill: parent - anchors.leftMargin: UM.Theme.getSize("setting_unit_margin").width - anchors.rightMargin: UM.Theme.getSize("setting_unit_margin").width - - text: model.name - color: model.enabled ? UM.Theme.getColor("setting_control_text"): UM.Theme.getColor("action_button_disabled_text") - - elide: Text.ElideRight - rightPadding: swatch.width + UM.Theme.getSize("setting_unit_margin").width - - background: Rectangle - { - id: swatch - height: Math.round(parent.height / 2) - width: height - radius: Math.round(width / 2) - anchors.right: parent.right - anchors.verticalCenter: parent.verticalCenter - anchors.rightMargin: UM.Theme.getSize("thin_margin").width - - color: supportExtruderCombobox.model.getItem(index).color - } - } - - background: Rectangle - { - color: parent.highlighted ? UM.Theme.getColor("setting_control_highlight") : "transparent" - border.color: parent.highlighted ? UM.Theme.getColor("setting_control_border_highlight") : "transparent" - } + color: parent.highlighted ? UM.Theme.getColor("setting_control_highlight") : "transparent" + border.color: parent.highlighted ? UM.Theme.getColor("setting_control_border_highlight") : "transparent" } } } -- cgit v1.2.3 From 09f2a73cb143accdc2860f9981224fa2177e64d6 Mon Sep 17 00:00:00 2001 From: "j.delarago" Date: Tue, 21 Jun 2022 16:29:41 +0200 Subject: Fix tooltip showing on hover when no tooltipText in provided. CURA-8849 --- resources/qml/IconWithText.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'resources') diff --git a/resources/qml/IconWithText.qml b/resources/qml/IconWithText.qml index dd3dea7c25..df72286943 100644 --- a/resources/qml/IconWithText.qml +++ b/resources/qml/IconWithText.qml @@ -24,7 +24,7 @@ Item property alias wrapMode: label.wrapMode property real spacing: UM.Theme.getSize("narrow_margin").width - property string tooltipText + property string tooltipText: "" // These properties can be used in combination with layouts. readonly property real contentWidth: icon.width + margin + label.contentWidth @@ -71,7 +71,7 @@ Item MouseArea { - enabled: tooltipText != null + enabled: tooltipText != "" anchors.fill: parent hoverEnabled: true onEntered: base.showTooltip(parent, Qt.point(-UM.Theme.getSize("thick_margin").width, 0), tooltipText) -- cgit v1.2.3 From c118bd4e2998e61d96e90b9d9e4569ef460c0615 Mon Sep 17 00:00:00 2001 From: "j.delarago" Date: Wed, 22 Jun 2022 11:13:50 +0200 Subject: Adjust space between configuration warning and resolution options to closer match design. CURA-8849 --- resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'resources') diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml index 086e27d41b..94de16141f 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml @@ -62,7 +62,7 @@ Item { width: parent.width Layout.fillWidth: true - Layout.topMargin: UM.Theme.getSize("thin_margin").height + Layout.topMargin: UM.Theme.getSize("default_margin").height Layout.bottomMargin: UM.Theme.getSize("thin_margin").height } -- cgit v1.2.3 From 8761a476a6994e18f28de191d0aebac5833f9b24 Mon Sep 17 00:00:00 2001 From: "j.delarago" Date: Tue, 28 Jun 2022 16:33:35 +0200 Subject: Fix height binding loops CURA-8849 --- .../PrintSetupSelector/Recommended/RecommendedSupportSelector.qml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'resources') diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml index fc56c7cfd7..3e40c16d74 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml @@ -14,15 +14,14 @@ import Cura 1.0 as Cura Item { id: enableSupportRow - height: childrenRect.height + height: UM.Theme.getSize("print_setup_big_item").height property real labelColumnWidth: Math.round(width / 3) Item { id: enableSupportContainer - height: enableSupportCheckBox - width: childrenRect.width + width: labelColumnWidth + enableSupportCheckBox.width anchors { @@ -30,7 +29,6 @@ Item top: parent.top bottom: parent.bottom rightMargin: UM.Theme.getSize("thick_margin").width - verticalCenter: parent.verticalCenter } Cura.IconWithText -- cgit v1.2.3 From 7700d01cf35b2d0ed7a93580051044257f925b6d Mon Sep 17 00:00:00 2001 From: "j.delarago" Date: Tue, 28 Jun 2022 16:39:25 +0200 Subject: Fix implicitWidth binding loop. CURA-8849 --- .../qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml | 2 +- .../PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'resources') diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml index b69587102e..8d31d6292d 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml @@ -13,7 +13,7 @@ import Cura 1.0 as Cura Item { id: enableAdhesionRow - height: childrenRect.height + height: enableAdhesionContainer.height property real labelColumnWidth: Math.round(width / 3) property var curaRecommendedMode: Cura.RecommendedMode {} diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml index 7cf7da00a6..bb3b0cdbec 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedInfillDensitySelector.qml @@ -103,7 +103,6 @@ Item id: backgroundLine height: UM.Theme.getSize("print_setup_slider_groove").height width: parent.width - UM.Theme.getSize("print_setup_slider_handle").width - implicitWidth: width anchors.horizontalCenter: parent.horizontalCenter anchors.verticalCenter: parent.verticalCenter color: infillSlider.enabled ? UM.Theme.getColor("quality_slider_available") : UM.Theme.getColor("quality_slider_unavailable") -- cgit v1.2.3