3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-08 22:35:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge branch '4.10'

Browse source
This commit is contained in:
Ghostkeeper 2021-06-15 16:30:17 +02:00
commit 8af12de955
No known key found for this signature in database
GPG key ID: 14C3586CD2EFC5B9
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cura/Machines/Models/QualitySettingsModel.py
View file

@ -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:

7
resources/qml/Dialogs/WorkspaceSummaryDialog.qml
View file

@ -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