From 467ae6a1d33a39e7f91c9709dadbf44b21b43223 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 15 Jun 2021 11:12:18 +0200 Subject: [PATCH 1/2] Fix quality_changes profile not showing CURA-7392 --- cura/Machines/Models/QualitySettingsModel.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cura/Machines/Models/QualitySettingsModel.py b/cura/Machines/Models/QualitySettingsModel.py index 3bd65688d8..b046b7546d 100644 --- a/cura/Machines/Models/QualitySettingsModel.py +++ b/cura/Machines/Models/QualitySettingsModel.py @@ -117,7 +117,9 @@ class QualitySettingsModel(ListModel): if self._selected_position == self.GLOBAL_STACK_POSITION and global_container: quality_changes_metadata = global_container.getMetaData() else: - quality_changes_metadata = extruders_container.get(str(self._selected_position)) + extruder = extruders_container.get(self._selected_position) + if extruder: + quality_changes_metadata = extruder.getMetaData() if quality_changes_metadata is not None: # It can be None if number of extruders are changed during runtime. container = container_registry.findContainers(id = quality_changes_metadata["id"]) if container: From adf3f51a4eb7fc67bcb36a5b10b3e93811daa7c2 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 15 Jun 2021 16:28:20 +0200 Subject: [PATCH 2/2] Use buttons from QtQuick.Controls 2 This is to make it look more consistent with the open dialog, which needed Controls 2 in order to make the drop-downs work on MacOS. As discussed in the CCB. --- resources/qml/Dialogs/WorkspaceSummaryDialog.qml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/resources/qml/Dialogs/WorkspaceSummaryDialog.qml b/resources/qml/Dialogs/WorkspaceSummaryDialog.qml index 32015b902a..9e0e972361 100644 --- a/resources/qml/Dialogs/WorkspaceSummaryDialog.qml +++ b/resources/qml/Dialogs/WorkspaceSummaryDialog.qml @@ -1,8 +1,9 @@ -// Copyright (c) 2018 Ultimaker B.V. +// Copyright (c) 2021 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.10 import QtQuick.Controls 1.4 +import QtQuick.Controls 2.0 as Controls2 import QtQuick.Layouts 1.3 import QtQuick.Window 2.2 @@ -281,7 +282,7 @@ UM.Dialog text: catalog.i18nc("@action:label", "Don't show project summary on save again") checked: dontShowAgain } - Button + Controls2.Button { id: cancel_button anchors @@ -293,7 +294,7 @@ UM.Dialog enabled: true onClicked: close() } - Button + Controls2.Button { id: ok_button anchors.right: parent.right